summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:56 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:56 +0100
commit65cf7c8566d814e0564ef86db698bd52fc6bc788 (patch)
tree167473aefba0e54c21bac0a227e1919b5697eb45
parent10cae3d5dd2128db2899fe0e3cd808edec5b33b3 (diff)
Remove option plain_descriptions
-rw-r--r--lib/help/option.txt6
-rw-r--r--lib/mods/theme/help/option.txt6
-rw-r--r--lib/mods/theme/user/all.prf3
-rw-r--r--src/externs.h1
-rw-r--r--src/object1.cc16
-rw-r--r--src/tables.cc3
-rw-r--r--src/variable.cc1
7 files changed, 8 insertions, 28 deletions
diff --git a/lib/help/option.txt b/lib/help/option.txt
index 6f6c3c1b..2089419c 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -303,12 +303,6 @@ off at will during the course of the game.
symbols. Note that the support for this option may not have been
compiled in on all platforms.
-#####GPlain object descriptions [plain_descriptions]
- In ToME, this option disables "full" names for identified flavoured
- objects; in other words, if this option is not in use, an identified
- Potion of Speed could be listed (for example) as a Blue Potion of Speed.
- If you prefer simpler, less verbose descriptions, set this option.
-
#####GMonsters learn from their mistakes [smart_learn]
Allow monsters to learn what spell attacks you are resistant to,
and to use this information to choose the best attacks.
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 4070a769..bb2401d0 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -303,12 +303,6 @@ off at will during the course of the game.
symbols. Note that the support for this option may not have been
compiled in on all platforms.
-#####GPlain object descriptions [plain_descriptions]
- In ToME, this option disables "full" names for identified flavoured
- objects; in other words, if this option is not in use, an identified
- Potion of Speed could be listed (for example) as a Blue Potion of Speed.
- If you prefer simpler, less verbose descriptions, set this option.
-
#####GMonsters learn from their mistakes [smart_learn]
Allow monsters to learn what spell attacks you are resistant to,
and to use this information to choose the best attacks.
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index f17e31ed..9e0a1faf 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -140,9 +140,6 @@ X:flow_by_sound
# Option 'Use special symbols for the player char'
X:player_symbols
-# Option 'Plain object descriptions'
-Y:plain_descriptions
-
# Option 'Monsters learn from their mistakes'
X:smart_learn
diff --git a/src/externs.h b/src/externs.h
index 43b27328..e7d2f1ac 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -211,7 +211,6 @@ extern bool_ view_yellow_lite;
extern bool_ view_bright_lite;
extern bool_ view_granite_lite;
extern bool_ view_special_lite;
-extern bool_ plain_descriptions;
extern bool_ auto_destroy;
extern bool_ wear_confirm;
extern bool_ confirm_stairs;
diff --git a/src/object1.cc b/src/object1.cc
index 2ec915de..9e01eebd 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -1309,7 +1309,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
modstr = amulet_adj[indexx];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Amulet~";
else
basenm = aware ? "& # Amulet~" : "& # Amulet~";
@@ -1326,7 +1326,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
modstr = ring_adj[indexx];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Ring~";
else
basenm = aware ? "& # Ring~" : "& # Ring~";
@@ -1344,7 +1344,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
/* Color the object */
modstr = staff_adj[o_ptr->pval2 % MAX_WOODS];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Staff~";
else
basenm = "& # Staff~";
@@ -1356,7 +1356,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
/* Color the object */
modstr = wand_adj[o_ptr->pval2 % MAX_METALS];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Wand~";
else
basenm = "& # Wand~";
@@ -1368,7 +1368,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
/* Color the object */
modstr = rod_adj[indexx];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Rod Tip~";
else
basenm = aware ? "& # Rod Tip~" : "& # Rod Tip~";
@@ -1393,7 +1393,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
/* Color the object */
modstr = scroll_adj[indexx];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Scroll~";
else
basenm = aware ? "& Scroll~ titled \"#\"" : "& Scroll~ titled \"#\"";
@@ -1413,7 +1413,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
{
modstr = get_mimic_name(o_ptr->pval2);
}
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Potion~";
else
basenm = aware ? "& # Potion~" : "& # Potion~";
@@ -1428,7 +1428,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
/* Color the object */
modstr = food_adj[indexx];
if (aware) append_name = TRUE;
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if (aware || o_ptr->ident & IDENT_STOREB)
basenm = "& Mushroom~";
else
basenm = aware ? "& # Mushroom~" : "& # Mushroom~";
diff --git a/src/tables.cc b/src/tables.cc
index 1fdfa577..e1044977 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1501,9 +1501,6 @@ option_type option_info[] =
{ &player_symbols, FALSE, 3, 12,
"player_symbols", "Use special symbols for the player char"},
- { &plain_descriptions, TRUE, 3, 13,
- "plain_descriptions", "Plain object descriptions" },
-
{ &smart_learn, FALSE, 3, 14,
"smart_learn", "Monsters learn from their mistakes" },
diff --git a/src/variable.cc b/src/variable.cc
index d70f41bb..fb2b9984 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -207,7 +207,6 @@ bool_ small_levels; /* Allow unusually small dungeon levels */
bool_ empty_levels; /* Allow empty 'arena' levels */
bool_ always_small_level; /* Small levels */
bool_ player_symbols; /* Use varying symbols for the player char */
-bool_ plain_descriptions; /* Plain object descriptions */
bool_ auto_destroy; /* Known worthless items are destroyed without confirmation */
bool_ confirm_stairs; /* Prompt before staircases... */
bool_ wear_confirm; /* Confirm before putting on known cursed items */