diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-01-19 18:25:47 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-01-19 18:25:47 -0800 |
| commit | e3cb398a2baa95206a2c67e40e3b67d42c9a912e (patch) | |
| tree | d4baee567c1b29b31881360cb9413c67a5137602 /src/map/magic-stmt.cpp | |
| parent | 47cddc03205428a92d90385a2801ecc8a6a368f4 (diff) | |
| download | tmwa-e3cb398a2baa95206a2c67e40e3b67d42c9a912e.tar.gz tmwa-e3cb398a2baa95206a2c67e40e3b67d42c9a912e.tar.bz2 tmwa-e3cb398a2baa95206a2c67e40e3b67d42c9a912e.tar.xz tmwa-e3cb398a2baa95206a2c67e40e3b67d42c9a912e.zip | |
Remove hard-coded mob stuff, make mode enum
Diffstat (limited to 'src/map/magic-stmt.cpp')
| -rw-r--r-- | src/map/magic-stmt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index d93c44c..b89b3c4 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -483,7 +483,7 @@ int op_banish(env_t *, int, val_t *args) { struct mob_data *mob = (struct mob_data *) subject; - if (mob->mode & MOB_MODE_SUMMONED) + if (bool(mob->mode & MOB_MODE_SUMMONED)) mob_catch_delete(mob, 3); } @@ -623,7 +623,7 @@ int op_aggravate(env_t *, int, val_t *args) mob_target(other, victim, battle_get_range(victim)); if (AGGRAVATION_MODE_MAKES_AGGRESSIVE(mode)) - other->mode = 0x85 | (other->mode & MOB_SENSIBLE_MASK); /* war */ + other->mode = MobMode::war | (other->mode & MOB_SENSIBLE_MASK); if (AGGRAVATION_MODE_ATTACKS_CASTER(mode)) { @@ -676,15 +676,15 @@ int op_spawn(env_t *, int, val_t *args) case MONSTER_ATTITUDE_SERVANT: mob->state.special_mob_ai = 1; - mob->mode |= 0x04; + mob->mode |= MobMode::AGGRESSIVE; break; case MONSTER_ATTITUDE_FRIENDLY: - mob->mode = 0x80 | (mob->mode & 1); + mob->mode = MobMode::CAN_ATTACK | (mob->mode & MobMode::CAN_MOVE); break; case MONSTER_ATTITUDE_HOSTILE: - mob->mode = 0x84 | (mob->mode & 1); + mob->mode = MobMode::CAN_ATTACK | MobMode::AGGRESSIVE | (mob->mode & MobMode::CAN_MOVE); if (owner) { mob->target_id = owner->bl.id; @@ -693,7 +693,7 @@ int op_spawn(env_t *, int, val_t *args) break; case MONSTER_ATTITUDE_FROZEN: - mob->mode = 0; + mob->mode = MobMode::ZERO; break; } |