diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:42 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:42 +0100 |
| commit | 1dff4ac4fe5325ab8a2ac630d5211a5474e6a77b (patch) | |
| tree | b21959247fc13732d427602c06117911229deb7b | |
| parent | 6f612c6e6cf9b20c00fd2f515d3694d2b7f7f444 (diff) | |
Move MODIFY and MODIFY_AUX macros to monster2.cc
| -rw-r--r-- | src/defines.h | 5 | ||||
| -rw-r--r-- | src/monster2.cc | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/defines.h b/src/defines.h index 67ed3b6b..4c8039e1 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2967,11 +2967,6 @@ -/*** Monster blow constants ***/ - -#define MODIFY_AUX(o, n) ((o) = modify_aux((o), (n) >> 2, (n) & 3)) -#define MODIFY(o, n, min) MODIFY_AUX(o, n); (o) = ((o) < (min))?(min):(o) - /* * New monster blow methods */ diff --git a/src/monster2.cc b/src/monster2.cc index c3429298..65035cca 100644 --- a/src/monster2.cc +++ b/src/monster2.cc @@ -32,6 +32,9 @@ #define MAX_FUNNY 22 #define MAX_COMMENT 5 +#define MODIFY_AUX(o, n) ((o) = modify_aux((o), (n) >> 2, (n) & 3)) +#define MODIFY(o, n, min) MODIFY_AUX(o, n); (o) = ((o) < (min))?(min):(o) + s32b monster_exp(s16b level) { s32b capped_level = std::min(level, static_cast<s16b>(MONSTER_LEVEL_MAX)); |