diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
| commit | 06f3895bacfc80c69dd1c3bbfa2d1857ecde165b (patch) | |
| tree | ea9c59532861b584dec95554aaaad310b1f31833 /crawl-ref/source/dgn-shoals.cc | |
| parent | e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427 (diff) | |
| parent | 833bd72fba5a1c683a2391462986193e40d4d313 (diff) | |
| download | crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.tar.gz crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/food.cc
crawl-ref/source/libutil.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-stuff.cc
crawl-ref/source/spl-damage.cc
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
| -rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 1a65b6c4e9..b3447b4f4a 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -969,17 +969,11 @@ static int _shoals_tide_at(coord_def pos, int base_tide) if (!tide_caller) return base_tide; - // try to avoid the costly sqrt() call - const int rl_distance = grid_distance(pos, tide_caller_pos); - if (rl_distance > TIDE_CALL_RADIUS) + pos -= tide_caller->pos(); + if (pos.abs() > sqr(TIDE_CALL_RADIUS) + 1) return base_tide; - const int distance = - static_cast<int>(sqrt((float)(pos - tide_caller->pos()).abs())); - if (distance > TIDE_CALL_RADIUS) - return base_tide; - - return (base_tide + std::max(0, tide_called_peak - distance * 3)); + return (base_tide + std::max(0, tide_called_peak - pos.range() * 3)); } static std::vector<coord_def> _shoals_extra_tide_seeds() |