Further rename you.mp_max_*.

Because mp_max_temp is in fact permanent.

5 files changed, 14 insertions, 14 deletions

diff --git a/crawl-ref/source/dbg-asrt.cc b/crawl-ref/source/dbg-asrt.cc
index 8e22240202..e8bae564b9 100644
--- a/crawl-ref/source/dbg-asrt.cc
+++ b/crawl-ref/source/dbg-asrt.cc
@@ -154,7 +154,7 @@ static void _dump_player(FILE *file)
             you.hp_max_adj_temp, you.hp_max_adj_perm);
     fprintf(file, "MP: %d/%d; mods: %d/%d\n",
             you.magic_points, you.max_magic_points,
-            you.mp_max_adj_temp, you.mp_max_adj_perm);
+            you.mp_max_adj, you.mp_max_adj_base);
     fprintf(file, "Stats: %d (%d) %d (%d) %d (%d)\n",
             you.strength(false), you.max_strength(),
             you.intel(false), you.max_intel(),
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 929769fe28..34069c5414 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -177,7 +177,7 @@ static void _jobs_stat_init(job_type which_job)
     you.base_stats[STAT_DEX] += d;
 
     you.hp_max_adj_perm = 0;
-    you.mp_max_adj_perm = 0;
+    you.mp_max_adj_base = 0;
 }
 
 // Make sure no stats are unacceptably low
@@ -1066,7 +1066,7 @@ static void _setup_tutorial_miscs()
     you.gold = 0;
 
     // Give him some mana to play around with.
-    you.mp_max_adj_perm += 2;
+    you.mp_max_adj_base += 2;
 
     _newgame_make_item_tutorial(0, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE);
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index bfc4f07201..5da8c073f3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -4562,7 +4562,7 @@ int player_rotted()
 
 void rot_mp(int mp_loss)
 {
-    you.mp_max_adj_temp -= mp_loss;
+    you.mp_max_adj -= mp_loss;
     calc_mp();
 
     you.redraw_magic_points = true;
@@ -4673,7 +4673,7 @@ int get_real_hp(bool trans, bool rotted)
 
 int get_real_mp(bool include_items)
 {
-    int enp = you.experience_level + you.mp_max_adj_perm;
+    int enp = you.experience_level + you.mp_max_adj_base;
     enp += (you.experience_level * species_mp_modifier(you.species) + 1) / 3;
 
     int spell_extra = you.skill(SK_SPELLCASTING, you.experience_level * 3, true) / 14
@@ -4686,7 +4686,7 @@ int get_real_mp(bool include_items)
     enp = stepdown_value(enp, 9, 18, 45, 100);
 
     // This is our "rotted" base (applied after scaling):
-    enp += you.mp_max_adj_temp;
+    enp += you.mp_max_adj;
 
     // Yes, we really do want this duplication... this is so the stepdown
     // doesn't truncate before we apply the rotted base.  We're doing this
@@ -5659,8 +5659,8 @@ void player::init()
 
     magic_points     = 0;
     max_magic_points = 0;
-    mp_max_adj_temp  = 0;
-    mp_max_adj_perm  = 0;
+    mp_max_adj       = 0;
+    mp_max_adj_base  = 0;
 
     stat_loss.init(0);
     base_stats.init(0);
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index f8e16075da..ab3d53debe 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -63,8 +63,8 @@ public:
 
   int magic_points;
   int max_magic_points;
-  int mp_max_adj_temp;        // temporary max MP loss? (currently unused)
-  int mp_max_adj_perm;        // base MPs from background (and permanent loss)
+  int mp_max_adj;             // max MP loss from ability costs (post-stepdown)
+  int mp_max_adj_base;        // base MPs from background (pre-stepdown)
 
   FixedVector<int8_t, NUM_STATS> stat_loss;
   FixedVector<int8_t, NUM_STATS> base_stats;
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 4489ac1577..d1163e6659 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1342,8 +1342,8 @@ static void tag_construct_you(writer &th)
 
     marshallShort(th, you.hp_max_adj_temp);
     marshallShort(th, you.hp_max_adj_perm);
-    marshallShort(th, you.mp_max_adj_temp);
-    marshallShort(th, you.mp_max_adj_perm);
+    marshallShort(th, you.mp_max_adj);
+    marshallShort(th, you.mp_max_adj_base);
 
     marshallShort(th, you.pos().x);
     marshallShort(th, you.pos().y);
@@ -2216,8 +2216,8 @@ static void tag_read_you(reader &th)
 
     you.hp_max_adj_temp           = unmarshallShort(th);
     you.hp_max_adj_perm           = unmarshallShort(th);
-    you.mp_max_adj_temp           = unmarshallShort(th);
-    you.mp_max_adj_perm           = unmarshallShort(th);
+    you.mp_max_adj                = unmarshallShort(th);
+    you.mp_max_adj_base           = unmarshallShort(th);
 #if TAG_MAJOR_VERSION == 34
     if (th.getMinorVersion() < TAG_MINOR_CLASS_HP_0)
         you.hp_max_adj_perm -= 8;