summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-24 07:18:57 +0000
committerpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-24 07:18:57 +0000
commit466f7bec317bf52418535eb1f9ac997dff2b9f8e (patch)
tree0aaa3982b5201850718982181eff2ff8e9fb11ac /crawl-ref/source/initfile.cc
parent5b7c011ebc58789ff4a689db367ecbad0f3ee165 (diff)
downloadcrawl-ref-466f7bec317bf52418535eb1f9ac997dff2b9f8e.tar.gz
crawl-ref-466f7bec317bf52418535eb1f9ac997dff2b9f8e.zip
- Allow 'inscribed' in fire_order. Previously it was a special case and
always sorted to the end. Now it's controllable. Default is still to the end, but not for any real reason. Updated docs and init.txt. - Replace reduncant inscription docs from crawl_options.txt with a pointer to crawl_manual.txt. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3854 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f7e9e6bb67..7a9273d079 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -315,6 +315,8 @@ static fire_type str_to_fire_types( const std::string &str )
return (FIRE_NET);
else if (str == "return" || str == "returning")
return (FIRE_RETURNING);
+ else if (str == "inscribed")
+ return (FIRE_INSCRIBED);
return (FIRE_NONE);
}
@@ -767,7 +769,7 @@ void game_options::reset_options()
// Clear fire_order and set up the defaults.
set_fire_order("launcher, return, "
"javelin / dart / stone / rock /"
- " spear / net / handaxe / dagger",
+ " spear / net / handaxe / dagger, inscribed",
false);
item_stack_summary_minimum = 5;