Remove exp_need option; behave as if always set

8 files changed, 6 insertions, 36 deletions

diff --git a/lib/help/option.txt b/lib/help/option.txt
index f5a10ef4..c4f4f40e 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -468,11 +468,6 @@ Features which are unique to ToME are collected in this menu.
     for new players.  More experienced players may wish to switch this option
     off.
 
-#####GShow the experience needed for the next level    [exp_need]
-    Setting this option alters the display of experience on the left of
-    the main screen to the experience needed to reach the next character level,
-    instead of the character's current total experience.
-
 #####GUse the old(Z) coloring scheme(reload the game)    [old_colors]
     Setting this option toggles the ASCII game colour display from the
     standard Angband monster colours to the Zangband-based monster colours.
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 8b2e77f3..7841bf89 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -467,11 +467,6 @@ Features which are unique to ToME are collected in this menu.
     for new players.  More experienced players may wish to switch this option
     off.
 
-#####GShow the experience needed for the next level    [exp_need]
-    Setting this option alters the display of experience on the left of
-    the main screen to the experience needed to reach the next character level,
-    instead of the character's current total experience.
-
 #####GUse the old(Z) coloring scheme(reload the game)    [old_colors]
     Setting this option toggles the ASCII game colour display from the
     standard Angband monster colours to the Zangband-based monster colours.
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index ee5e95dd..b21abb03 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -215,9 +215,6 @@ X:center_player
 # Option 'Ingame contextual help'
 X:ingame_help
 
-# Option 'Show the experience needed for next level'
-X:exp_need
-
 # Option 'Use the old(Z) coloring scheme(reload the game)'
 X:old_colors
 
diff --git a/src/externs.h b/src/externs.h
index c574bb26..bd8fc3a2 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -497,7 +497,6 @@ extern bool_ joke_monsters;
 extern bool_ center_player;
 extern s16b plots[MAX_PLOTS];
 extern random_quest random_quests[MAX_RANDOM_QUEST];
-extern bool_ exp_need;
 extern bool_ fate_option;
 extern bool_ *special_lvl[MAX_DUNGEON_DEPTH];
 extern bool_ generate_special_feeling;
diff --git a/src/object1.cc b/src/object1.cc
index 9fef5eaf..2ec915de 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -1944,16 +1944,15 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 	if ((f4 & TR4_LEVELS) && known)
 	{
 		t = object_desc_str(t, " (E:");
-		if (exp_need)
+		if (o_ptr->elevel < PY_MAX_LEVEL)
 		{
-			s32b need;
 			/* Formula from check_experience_obj(). */
-			need = player_exp[o_ptr->elevel - 1] * 5 / 2;
+			s32b need = player_exp[o_ptr->elevel - 1] * 5 / 2;
 			t = object_desc_num(t, need - o_ptr->exp);
 		}
 		else
 		{
-			t = object_desc_num(t, o_ptr->exp);
+			t = object_desc_str(t, "*****");
 		}
 		t = object_desc_str(t, ", L:");
 		t = object_desc_num(t, o_ptr->elevel);
diff --git a/src/tables.cc b/src/tables.cc
index 63ea61fe..d9ddbaaf 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1577,9 +1577,6 @@ option_type option_info[] =
 	{ &option_ingame_help, TRUE, 5, 1,
 	  "ingame_help", "Ingame contextual help" },
 
-	{ &exp_need, FALSE, 5, 2,
-	  "exp_need", "Show the experience needed for next level" },
-
 	{ &auto_more, FALSE, 5, 4,
 	  "auto_more", "Automatically clear '-more-' prompts" },
 
diff --git a/src/variable.cc b/src/variable.cc
index 60949c2d..a37ef0c3 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -1165,11 +1165,6 @@ s16b plots[MAX_PLOTS];
 random_quest random_quests[MAX_RANDOM_QUEST];
 
 /*
- * Show exp left
- */
-bool_ exp_need;
-
-/*
  * Fated ?
  */
 bool_ fate_option;
diff --git a/src/xtra1.cc b/src/xtra1.cc
index c2111a43..1a9a828f 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -320,20 +320,13 @@ static void prt_exp(void)
 {
 	char out_val[32];
 
-	if (!exp_need)
+	if ((p_ptr->lev >= PY_MAX_LEVEL) || (p_ptr->lev >= max_plev))
 	{
-		(void)sprintf(out_val, "%8ld", (long)p_ptr->exp);
+		(void)sprintf(out_val, "********");
 	}
 	else
 	{
-		if ((p_ptr->lev >= PY_MAX_LEVEL) || (p_ptr->lev >= max_plev))
-		{
-			(void)sprintf(out_val, "********");
-		}
-		else
-		{
-			(void)sprintf(out_val, "%8ld", (long)(player_exp[p_ptr->lev - 1] * p_ptr->expfact / 100L) - p_ptr->exp);
-		}
+		(void)sprintf(out_val, "%8ld", (long)(player_exp[p_ptr->lev - 1] * p_ptr->expfact / 100L) - p_ptr->exp);
 	}
 
 	if (p_ptr->exp >= p_ptr->max_exp)