diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/initfile.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index e6cd2746e1..c8b53c44af 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -706,11 +706,12 @@ void game_options::reset_options() flush_input[ FLUSH_ON_MESSAGE ] = false; flush_input[ FLUSH_LUA ] = true; - fire_items_start = 2; // start at slot 'c' + fire_items_start = 0; // start at slot 'a' // Clear fire_order and set up the defaults. set_fire_order("launcher, return, " - "javelin / dart / stone / rock / spear / net / handaxe", + "javelin / dart / stone / rock /" + " spear / net / handaxe / dagger", false); item_stack_summary_minimum = 5; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6f4f2d1bfc..5aeccf8cf1 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1281,7 +1281,7 @@ static bool fire_item_matches(const item_def &item, unsigned fire_type) static bool fire_item_okay(const item_def &item, unsigned flags) { return (fire_item_matches(item, flags) - && !(you.equip[EQ_WEAPON] == item.link && item_cursed(item))); + && you.equip[EQ_WEAPON] != item.link); } static int find_fire_item_matching(unsigned fire_type, int start, |