summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-02 11:09:45 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-02 11:09:45 +0000
commit8f7d489f3cd6deac14f517f459a991e22d015ed6 (patch)
tree66bacb31af7083100a7133f8dfe0e591edbf4757 /crawl-ref/source/initfile.cc
parent95a05880fa4501233845f38cc5e28a78a76b3c80 (diff)
downloadcrawl-ref-8f7d489f3cd6deac14f517f459a991e22d015ed6.tar.gz
crawl-ref-8f7d489f3cd6deac14f517f459a991e22d015ed6.zip
[FR 1816805] Implementing a new species/classes order on the character
selection screen This involved the following: * tentative clean-up of newgame.cc (an utter nightmare!) * throw out JOB_QUITTER and SP_UNKx_DRACONIAN as (as far as I can tell) they serve absolutely no purpose (Should they be necessary for scoring etc. it's probably better to put these at the end rather than the middle of the lists.) * breaks saves I'm quite happy with the new species order, but the order of jobs could be improved. Luckily, changing that is totally easy now. :) See newgame.cc for old vs. new orders. (And yes, there is an option to keep the old way.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc26
1 files changed, 16 insertions, 10 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index d270bb5dab..c69350eed8 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -607,23 +607,24 @@ void game_options::reset_options()
center_on_scroll = false;
symmetric_scroll = true;
- scroll_margin_x = 2;
- scroll_margin_y = 2;
+ scroll_margin_x = 2;
+ scroll_margin_y = 2;
autopickup_on = true;
autoprayer_on = false;
show_more_prompt = true;
show_turns = false;
- show_beam = false;
-
- prev_race = 0;
- prev_cls = 0;
- prev_ck = GOD_NO_GOD;
- prev_dk = DK_NO_SELECTION;
- prev_pr = GOD_NO_GOD;
+ show_beam = false;
+
+ use_old_selection_order = false;
+ prev_race = 0;
+ prev_cls = 0;
+ prev_ck = GOD_NO_GOD;
+ prev_dk = DK_NO_SELECTION;
+ prev_pr = GOD_NO_GOD;
prev_weapon = WPN_UNKNOWN;
- prev_book = SBT_NO_SELECTION;
+ prev_book = SBT_NO_SELECTION;
prev_randpick = false;
remember_name = true;
@@ -1715,6 +1716,11 @@ void game_options::read_option_line(const std::string &str, bool runscript)
}
}
#endif
+ else if (key == "use_old_selection_order")
+ {
+ // use old order of species/classes on selection screen?
+ use_old_selection_order = read_bool( field, use_old_selection_order );
+ }
else if (key == "default_autopickup")
{
// should autopickup default to on or off?