diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 07:42:43 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 07:42:43 +0200 |
| commit | 3941b7834f0a038ed544e6ee96b9920d43db4c32 (patch) | |
| tree | 4c0cb0d2a37105eb40b88608c9c9e18fc0d1dd5b /src/corrupt.cc | |
| parent | 3966bfb2f6836d13c1a93bfab1e9fa61ec4fff35 (diff) | |
Rework PR{1,2}_* flags to flag_set<>
Since there's no need for two tiers we also reduce the flag set
to 1 tier. (Breaks savefile compatbility.)
Diffstat (limited to 'src/corrupt.cc')
| -rw-r--r-- | src/corrupt.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corrupt.cc b/src/corrupt.cc index 8d5670c6..64569264 100644 --- a/src/corrupt.cc +++ b/src/corrupt.cc @@ -3,6 +3,7 @@ #include "init1.hpp" #include "object_flag.hpp" #include "player_race.hpp" +#include "player_race_flag.hpp" #include "player_race_mod.hpp" #include "player_type.hpp" #include "stats.hpp" @@ -60,10 +61,10 @@ static void player_gain_vampire_teeth() rmp_ptr = &race_mod_info[SUBRACE_SAVE]; subrace_add_power(rmp_ptr, PWR_VAMPIRISM); - rmp_ptr->flags1 = rmp_ptr->flags1 - | PR1_VAMPIRE - | PR1_UNDEAD - | PR1_NO_SUBRACE_CHANGE; + rmp_ptr->flags = rmp_ptr->flags + | PR_VAMPIRE + | PR_UNDEAD + | PR_NO_SUBRACE_CHANGE; } static void player_gain_vampire_strength() @@ -105,7 +106,7 @@ static void player_gain_vampire() } /* Bonus/and .. not bonus :) */ - rmp_ptr->flags1 = rmp_ptr->flags1 | PR1_HURT_LITE; + rmp_ptr->flags = rmp_ptr->flags | PR_HURT_LITE; rmp_ptr->oflags[2] = rmp_ptr->oflags[2] | TR_RES_POIS | TR_RES_NETHER @@ -766,7 +767,7 @@ static bool_ player_allow_corruption(int corruption_idx) /* Vampire teeth is special */ if (corruption_idx == CORRUPT_VAMPIRE_TEETH) { - if (race_flags1_p(PR1_NO_SUBRACE_CHANGE)) + if (race_flags_p(PR_NO_SUBRACE_CHANGE)) { return TRUE; } |