diff options
| author | Neil Moore <neil@s-z.org> | 2012-08-01 16:09:16 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-08-01 17:08:37 -0400 |
| commit | 1cc90225baf47270bbe2a22c1ecbbc839eaa2b90 (patch) | |
| tree | bd8816720989c3d2193ccaa82cbca5f7b6f2deca /crawl-ref/source/dgn-shoals.cc | |
| parent | a0a9240421e89e77aac6011671931521d7e60f0a (diff) | |
| download | crawl-ref-1cc90225baf47270bbe2a22c1ecbbc839eaa2b90.tar.gz crawl-ref-1cc90225baf47270bbe2a22c1ecbbc839eaa2b90.zip | |
Massive style fix (braces, indentation, etc.)
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
| -rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index c84666cf8a..4fe96f3362 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -747,8 +747,7 @@ static void _shoals_run_tide(int &tide, int &acc) tide += acc; tide = std::max(std::min(tide, HIGH_TIDE), LOW_TIDE); - if ((tide == HIGH_TIDE && acc > 0) - || (tide == LOW_TIDE && acc < 0)) + if ((tide == HIGH_TIDE && acc > 0) || (tide == LOW_TIDE && acc < 0)) acc = -acc; bool in_decel_margin = (abs(tide - HIGH_TIDE) < TIDE_DECEL_MARGIN) @@ -1010,8 +1009,10 @@ static void _shoals_apply_tide(int tide, bool incremental_tide) const bool was_wet(_shoals_tide_passable_feat(herefeat)); seen_points(c) = true; if (_shoals_tide_susceptible_feat(herefeat)) + { _shoals_apply_tide_at(c, _shoals_tide_at(c, tide), incremental_tide); + } const bool is_wet(feat_is_water(grd(c))); |