diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/externs.h | 1 | ||||
| -rw-r--r-- | src/object1.cc | 16 | ||||
| -rw-r--r-- | src/tables.cc | 3 | ||||
| -rw-r--r-- | src/variable.cc | 1 |
4 files changed, 8 insertions, 13 deletions
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 */ |