summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/options.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-04-11 01:58:59 +0200
committerAdam Borowski <kilobyte@angband.pl>2013-04-11 03:14:56 +0200
commit7fddca25532c09a083f1685dc4867ee2982fbf47 (patch)
treedf1f3cfb66172ed8a850d384f5f648bf26434b8a /crawl-ref/source/options.h
parent77598ac1b781e9743f0a5efecfed6a3a55c6d9d7 (diff)
downloadcrawl-ref-7fddca25532c09a083f1685dc4867ee2982fbf47.tar.gz
crawl-ref-7fddca25532c09a083f1685dc4867ee2982fbf47.zip
Don't claim auto_sacrifice is a "generic option", rename its enums.
Diffstat (limited to 'crawl-ref/source/options.h')
-rw-r--r--crawl-ref/source/options.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index 1d3a400372..bee5ab6b29 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -5,14 +5,13 @@
#include "pattern.h"
#include "newgame_def.h"
-// Intended to be somewhat generic
-enum option_value {
- OPT_AUTO = -1,
- OPT_NO,
- OPT_YES,
- OPT_PROMPT,
- OPT_BEFORE_EXPLORE,
- OPT_PROMPT_IGNORE
+enum autosac_type
+{
+ AS_NO,
+ AS_YES,
+ AS_PROMPT,
+ AS_BEFORE_EXPLORE,
+ AS_PROMPT_IGNORE,
};
struct message_filter
@@ -314,7 +313,7 @@ public:
bool travel_key_stop; // Travel stops on keypress.
- option_value auto_sacrifice;
+ autosac_type auto_sacrifice;
vector<sound_mapping> sound_mappings;
vector<colour_mapping> menu_colour_mappings;
@@ -438,7 +437,7 @@ public:
int tile_map_pixels;
int tile_cell_pixels;
bool tile_filter_scaling;
- option_value tile_use_small_layout;
+ maybe_bool tile_use_small_layout;
#endif
#ifdef USE_TILE