diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/godconduct.cc | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip | |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index c634ce6f15..b46c87aaab 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -359,8 +359,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 18 - you.experience_level / 2; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: @@ -385,8 +385,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, piety_denom = level + 18 - (is_good_god(you.religion) ? 0 : you.experience_level / 2); piety_change = piety_denom - 5; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: @@ -412,8 +412,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, piety_denom = level + 18 - (is_good_god(you.religion) ? 0 : you.experience_level / 2); piety_change = piety_denom - 4; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: @@ -476,8 +476,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 18 - you.experience_level / 2; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); const int speed_delta = cheibriados_monster_player_speed_delta(victim); @@ -624,8 +624,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 10 - you.experience_level/3; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -644,8 +644,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 10 - you.experience_level/3; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -663,8 +663,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 10 - you.experience_level/3; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -684,8 +684,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, piety_denom = level + 10 - (is_good_god(you.religion) ? 0 : you.experience_level/3); piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -703,8 +703,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, retval = true; piety_denom = level + 10 - you.experience_level/3; piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -724,8 +724,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, piety_denom = level + 10 - (is_good_god(you.religion) ? 0 : you.experience_level/3); piety_change = piety_denom - 6; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); break; default: break; @@ -985,8 +985,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; piety_denom = level / 2 + 6 - you.experience_level / 4; piety_change = piety_denom - 4; - piety_denom = std::max(piety_denom, 1); - piety_change = std::max(piety_change, 0); + piety_denom = max(piety_denom, 1); + piety_change = max(piety_change, 0); retval = true; } break; |