From b85a1f777946af3ba763942ee78a7a4bce2afdb0 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Move player_hp[] into Game --- src/xtra1.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/xtra1.cc') diff --git a/src/xtra1.cc b/src/xtra1.cc index c8fdb2e0..b4f2adf6 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -1841,15 +1841,13 @@ static void calc_mana(void) */ void calc_hitpoints(void) { - int bonus, mhp; + auto const &player_hp = game->player_hp; /* Un-inflate "half-hitpoint bonus per level" value */ - bonus = ((int)(adj_con_mhp[p_ptr->stat_ind[A_CON]]) - 128); + int const bonus = ((int)(adj_con_mhp[p_ptr->stat_ind[A_CON]]) - 128); /* Calculate hitpoints */ - assert(p_ptr->lev - 1 >= 0); - assert(p_ptr->lev - 1 < PY_MAX_LEVEL); - mhp = player_hp[p_ptr->lev - 1] + (bonus * p_ptr->lev / 2); + int mhp = player_hp[p_ptr->lev - 1] + (bonus * p_ptr->lev / 2); /* Always have at least one hitpoint per level */ if (mhp < p_ptr->lev + 1) mhp = p_ptr->lev + 1; -- cgit v1.2.3