diff options
-rw-r--r-- | crawl-ref/source/initfile.cc | 11 | ||||
-rw-r--r-- | crawl-ref/source/travel.cc | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 7b385849dd..6f00509838 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -598,7 +598,7 @@ void game_options::reset_options() use_notes = true; note_skill_max = false; note_all_spells = false; - note_hp_percent = 0; + note_hp_percent = 5; ood_interesting = 8; terse_hand = true; increasing_skill_progress = true; @@ -681,12 +681,13 @@ void game_options::reset_options() // Note: These fire options currently match the old behaviour. -- bwr fire_items_start = 0; // start at slot 'a' + // Clear fire_order and set up the defaults. + for (int i = 0; i < NUM_FIRE_TYPES; i++) + fire_order[i] = FIRE_NONE; + fire_order[0] = FIRE_LAUNCHER; // fire first from bow... fire_order[1] = FIRE_DART; // then only consider darts - - // clear the rest of the list - for (int i = 2; i < NUM_FIRE_TYPES; i++) - fire_order[i] = FIRE_NONE; + fire_order[2] = FIRE_STONE; // and then chuck stones #ifdef WIZARD fsim_rounds = 40000L; diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 6e5de5d843..23c62094cc 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -77,12 +77,6 @@ static level_pos travel_hell_entry; static bool traps_inited = false; -// TODO: Do we need this or would a different header be better? -inline int sgn(int x) -{ - return x < 0? -1 : (x > 0); -} - // Array of points on the map, each value being the distance the character // would have to travel to get there. Negative distances imply that the point // is a) a trap or hostile terrain or b) only reachable by crossing a trap or |