diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index f35db305b5..0d46b33945 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1953,8 +1953,6 @@ bool throw_it(struct bolt &pbolt, int throw_2, monsters *dummy_target) pbolt.damage.size = dice_mult * pbolt.damage.size / 100; pbolt.damage.size += slayDam; - scale_dice( pbolt.damage ); - // only add bonuses if we're throwing something sensible if (thrown || launched || wepClass == OBJ_WEAPONS) { @@ -1962,6 +1960,8 @@ bool throw_it(struct bolt &pbolt, int throw_2, monsters *dummy_target) pbolt.damage.size += ammoDamBonus + lnchDamBonus; } + scale_dice( pbolt.damage ); + #if DEBUG_DIAGNOSTICS mprf( MSGCH_DIAGNOSTICS, "H:%d+%d;a%dl%d. D:%d+%d;a%dl%d -> %d,%dd%d", diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index a781f55e86..aae69a71ba 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -2504,7 +2504,8 @@ void show_map( FixedVector<int, 2> &spec_place, bool travel_mode ) case CONTROL('F'): case CONTROL('W'): - travel_cache.add_waypoint(start_x + curs_x, start_y + curs_y); + travel_cache.add_waypoint(start_x + curs_x - 1, + start_y + curs_y - 1); // We need to do this all over again so that the user can jump // to the waypoint he just created. features.clear(); @@ -2516,7 +2517,7 @@ void show_map( FixedVector<int, 2> &spec_place, bool travel_mode ) case CONTROL('E'): case CONTROL('X'): { - int x = start_x + curs_x, y = start_y + curs_y; + int x = start_x + curs_x - 1, y = start_y + curs_y - 1; if (getty == CONTROL('X')) toggle_exclude(x, y); else |