diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:45:08 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:49:37 +0200 |
commit | 0c2f30b56c221a826ba64f0ec864c29d0f717644 (patch) | |
tree | a7b38e7b9cf9a06aacd56ec8a7177d44d001c1df /src/dungeon.cc | |
parent | 5ddcbbf1cdce68e565376819efedd519892512ad (diff) |
Move r_info into GameEditData
Diffstat (limited to 'src/dungeon.cc')
-rw-r--r-- | src/dungeon.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index d3554e50..c044021f 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -775,6 +775,8 @@ static void regenmana(int percent) */ static void regen_monsters(void) { + auto const &r_info = game->edit_data.r_info; + int i, frac; object_type *o_ptr = &p_ptr->inventory[INVEN_CARRY]; @@ -782,7 +784,7 @@ static void regen_monsters(void) if (o_ptr->k_idx) { - monster_race *r_ptr = &r_info[o_ptr->pval]; + auto r_ptr = &r_info[o_ptr->pval]; /* Allow regeneration (if needed) */ if (o_ptr->pval2 < o_ptr->pval3) @@ -1216,6 +1218,7 @@ static void process_world_gods() static void process_world(void) { auto const &d_info = game->edit_data.d_info; + auto const &r_info = game->edit_data.r_info; timer_type *t_ptr; @@ -1291,7 +1294,7 @@ static void process_world(void) if (o_ptr->k_idx) { - monster_race *r_ptr = &r_info[o_ptr->pval]; + auto r_ptr = &r_info[o_ptr->pval]; if ((randint(1000) < r_ptr->level - ((p_ptr->lev * 2) + get_skill(SKILL_SYMBIOTIC)))) { |