From 0c2f30b56c221a826ba64f0ec864c29d0f717644 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move r_info into GameEditData --- src/dungeon.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/dungeon.cc') 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)))) { -- cgit v1.2.3