From c6c713350f8331a439acc5672bb1789d3c9add5c Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 21:24:23 +0200
Subject: Remove "munchkin_multipliers" global

---
 src/externs.h  |  1 -
 src/object1.c  | 20 +++-----------------
 src/variable.c |  5 -----
 src/xtra1.c    | 18 ++++--------------
 4 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/src/externs.h b/src/externs.h
index 3c9d6d74..da47af0f 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -526,7 +526,6 @@ extern bool_ *a_allow_special;
 extern bool_ rand_birth;
 extern bool_ fast_autoroller;
 extern bool_ joke_monsters;
-extern bool_ munchkin_multipliers;
 extern bool_ center_player;
 extern s16b plots[MAX_PLOTS];
 extern random_quest random_quests[MAX_RANDOM_QUEST];
diff --git a/src/object1.c b/src/object1.c
index 655e4e2c..86f98ae5 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -2246,28 +2246,14 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 	if ((f1 & TR1_MANA) && (known) && (o_ptr->pval > 0))
 	{
 		t = object_desc_chr(t, '(');
-		if (munchkin_multipliers)
-		{
-			t = object_desc_num(t, 100 * o_ptr->pval / 5);
-		}
-		else
-		{
-			t = object_desc_num(t, 100 * o_ptr->pval / 10);
-		}
+		t = object_desc_num(t, 100 * o_ptr->pval / 5);
 		t = object_desc_str(t, "%)");
 	}
 
 	if ((known) && (f2 & TR2_LIFE) ) /* Can disp neg now -- Improv */
 	{
 		t = object_desc_chr(t, '(');
-		if (munchkin_multipliers)
-		{
-			t = object_desc_num(t, 100 * o_ptr->pval / 5);
-		}
-		else
-		{
-			t = object_desc_num(t, 100 * o_ptr->pval / 10);
-		}
+		t = object_desc_num(t, 100 * o_ptr->pval / 5);
 		t = object_desc_str(t, "%)");
 	}
 
@@ -3157,7 +3143,7 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
 			}
 
 			text_out(" by ");
-			percent = 100 * o_ptr->pval / ( munchkin_multipliers ? 5 : 10 );
+			percent = 100 * o_ptr->pval / 5;
 
 
 			if (o_ptr->pval > 0)
diff --git a/src/variable.c b/src/variable.c
index 64cd49c7..6302d57a 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1318,11 +1318,6 @@ bool_ fast_autoroller;
  */
 bool_ joke_monsters;
 
-/*
- * How will mana staf & weapons of life act
- */
-bool_ munchkin_multipliers = TRUE;
-
 /*
  * Center view
  */
diff --git a/src/xtra1.c b/src/xtra1.c
index d24eaa5c..d4df67af 100644
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -1747,13 +1747,9 @@ static void calc_mana(void)
 	}
 
 	/* Augment mana */
-	if (munchkin_multipliers)
+	if (p_ptr->to_m)
 	{
-		if (p_ptr->to_m) msp += msp * p_ptr->to_m / 5;
-	}
-	else
-	{
-		if (p_ptr->to_m) msp += msp * p_ptr->to_m / 10;
+		msp += msp * p_ptr->to_m / 5;
 	}
 
 	/* Assume player not encumbered by armor */
@@ -1903,14 +1899,8 @@ void calc_hitpoints(void)
 	if (p_ptr->shero) mhp += 30;
 
 	/* Augment Hitpoint */
-	if (munchkin_multipliers)
-	{
-		mhp += mhp * p_ptr->to_l / 5;
-	}
-	else
-	{
-		mhp += mhp * p_ptr->to_l / 10;
-	}
+	mhp += mhp * p_ptr->to_l / 5;
+
 	if (mhp < 1) mhp = 1;
 
 	if (p_ptr->body_monster)
-- 
cgit v1.2.3