diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/externs.h | 6 | ||||
-rw-r--r-- | src/joke.cc | 1 | ||||
-rw-r--r-- | src/options.cc | 12 | ||||
-rw-r--r-- | src/options.hpp | 12 | ||||
-rw-r--r-- | src/tables.cc | 2 | ||||
-rw-r--r-- | src/variable.cc | 20 |
6 files changed, 26 insertions, 27 deletions
diff --git a/src/externs.h b/src/externs.h index 766d87e5..b2a85aa3 100644 --- a/src/externs.h +++ b/src/externs.h @@ -266,17 +266,13 @@ extern byte dungeon_type; extern s16b *max_dlv; extern s16b doppleganger; extern bool_ generate_encounter; -extern bool_ autoroll; -extern bool_ point_based; -extern bool_ preserve, special_lvls, ironman_rooms; +extern bool_ special_lvls; extern bool_ *m_allow_special; extern bool_ *k_allow_special; extern bool_ *a_allow_special; -extern bool_ joke_monsters; extern bool_ center_player; extern s16b plots[MAX_PLOTS]; extern random_quest random_quests[MAX_RANDOM_QUEST]; -extern bool_ fate_option; extern bool_ *special_lvl[MAX_DUNGEON_DEPTH]; extern bool_ generate_special_feeling; extern u32b dungeon_flags1; diff --git a/src/joke.cc b/src/joke.cc index 44109e5a..e07a313e 100644 --- a/src/joke.cc +++ b/src/joke.cc @@ -2,6 +2,7 @@ #include "angband.h" #include "monster2.hpp" +#include "options.hpp" #include "util.hpp" static void gen_joke_place_monster(int r_idx) diff --git a/src/options.cc b/src/options.cc index 095df037..7acea8ce 100644 --- a/src/options.cc +++ b/src/options.cc @@ -31,7 +31,6 @@ bool_ alert_failure; /* Alert user to various failures */ bool_ last_words; /* Get last words upon dying */ bool_ small_levels; /* Allow unusually small dungeon levels */ bool_ empty_levels; /* Allow empty 'arena' levels */ -bool_ always_small_level; /* Small levels */ bool_ confirm_stairs; /* Prompt before staircases... */ bool_ wear_confirm; /* Confirm before putting on known cursed items */ bool_ disturb_pets; /* Pets moving nearby disturb us */ @@ -78,3 +77,14 @@ bool_ auto_more; /* Auto more */ bool_ inventory_no_move; /* In inventory option window, just erase the letters, * rather that displaying the list without the invalid * selections */ + +// +// Option Set 6 - Birth options +// +bool_ always_small_level; +bool_ autoroll; +bool_ fate_option; +bool_ ironman_rooms; +bool_ joke_monsters; +bool_ point_based; +bool_ preserve; diff --git a/src/options.hpp b/src/options.hpp index fd68e163..13620780 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -33,7 +33,6 @@ extern bool_ alert_failure; extern bool_ last_words; extern bool_ small_levels; extern bool_ empty_levels; -extern bool_ always_small_level; extern bool_ confirm_stairs; extern bool_ wear_confirm; extern bool_ disturb_pets; @@ -78,3 +77,14 @@ extern bool_ player_char_health; extern bool_ option_ingame_help; extern bool_ auto_more; extern bool_ inventory_no_move; + +// +// Option Set 6 - Birth options +// +extern bool_ always_small_level; +extern bool_ autoroll; +extern bool_ fate_option; +extern bool_ ironman_rooms; +extern bool_ joke_monsters; +extern bool_ point_based; +extern bool_ preserve; diff --git a/src/tables.cc b/src/tables.cc index 4f0e63db..a1b2d698 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -1474,8 +1474,6 @@ option_type option_info[] = { &joke_monsters, FALSE, 6, 14, "joke_monsters", "Allow use of some 'joke' monsters" }, - /* XXX */ - { &always_small_level, FALSE, 6, 16, "always_small_level", "Always make small levels" }, diff --git a/src/variable.cc b/src/variable.cc index f9bdbc96..3307dbbe 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -942,14 +942,8 @@ s16b doppleganger; /* To allow wilderness encounters */ bool_ generate_encounter; -/* Autoroler */ -bool_ autoroll; - -/* Point based */ -bool_ point_based; - -/* Preserve, special levels, ironman_rooms */ -bool_ preserve, special_lvls, ironman_rooms; +/* Special levels */ +bool_ special_lvls; /* * Such an ugly hack ... @@ -959,11 +953,6 @@ bool_ *k_allow_special; bool_ *a_allow_special; /* - * Which monsters are allowed ? - */ -bool_ joke_monsters; - -/* * Center view */ bool_ center_player = FALSE; @@ -979,11 +968,6 @@ s16b plots[MAX_PLOTS]; random_quest random_quests[MAX_RANDOM_QUEST]; /* - * Fated ? - */ -bool_ fate_option; - -/* * Special levels */ bool_ *special_lvl[MAX_DUNGEON_DEPTH]; |