diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 10:13:59 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 10:27:06 +0200 |
| commit | e3cd14d9d6d0e90bae7864025e5b2865c045ef96 (patch) | |
| tree | cb8aaebe606c82891aa4a673f4bc28da8a20647f /src/wild.cc | |
| parent | 7bbfa3f27a97c6e0546f53a3254de38e513ed334 (diff) | |
Rework SF1_* flags to flag_set<>
Diffstat (limited to 'src/wild.cc')
| -rw-r--r-- | src/wild.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wild.cc b/src/wild.cc index 7e7b20d0..d928b4a3 100644 --- a/src/wild.cc +++ b/src/wild.cc @@ -21,6 +21,7 @@ #include "options.hpp" #include "player_type.hpp" #include "store_info_type.hpp" +#include "store_flag.hpp" #include "tables.hpp" #include "town_type.hpp" #include "util.hpp" @@ -890,9 +891,9 @@ static int get_shops(int *rooms) { int chance = 50; - if (st_info[n].flags1 & SF1_COMMON) chance += 30; - if (st_info[n].flags1 & SF1_RARE) chance -= 20; - if (st_info[n].flags1 & SF1_VERY_RARE) chance -= 30; + if (st_info[n].flags & STF_COMMON) chance += 30; + if (st_info[n].flags & STF_RARE) chance -= 20; + if (st_info[n].flags & STF_VERY_RARE) chance -= 30; if (!magik(chance)) continue; @@ -900,7 +901,7 @@ static int get_shops(int *rooms) if (rooms[i] == n) continue; - if (st_info[n].flags1 & SF1_RANDOM) rooms[num++] = n; + if (st_info[n].flags & STF_RANDOM) rooms[num++] = n; } return num; |