diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-02-09 19:18:05 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-02-09 19:18:05 +0100 |
| commit | 761c82e65ae01e56d0efc7a7ba0dabdb2e44c5a7 (patch) | |
| tree | 7efefd67254d45961f3fb29fd2e7b47f73ae2b01 /src | |
| parent | 25cdc5d9801fb6ea38205da4b5c4decf63dff90c (diff) | |
Core/Maps: Use IsValidMapCoord for checking Z coord instead of just std::isfinite - only acceptable values are between -17066.6656 and 17066.6656
(cherry picked from commit 4d956c89fc6f20c546a396573cf42aa97b844c09)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Grids/GridDefines.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 14 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 596329e9499..ac8e0298a44 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -1909,9 +1909,6 @@ bool AchievementMgr::RequirementsSatisfied(AchievementCriteriaEntry const* achie if (!area) break; - if (area->exploreFlag < 0) - continue; - uint32 playerIndexOffset = uint32(area->exploreFlag) / 32; if (playerIndexOffset >= PLAYER_EXPLORED_ZONES_SIZE) continue; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 162c39b951b..24c9100b222 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -226,7 +226,7 @@ namespace Trinity inline bool IsValidMapCoord(float x, float y, float z) { - return IsValidMapCoord(x, y) && std::isfinite(z); + return IsValidMapCoord(x, y) && IsValidMapCoord(z); } inline bool IsValidMapCoord(float x, float y, float z, float o) diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 8ebbba784df..c70246f7fb5 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1060,13 +1060,6 @@ public: return false; } - if (area->exploreFlag < 0) - { - handler->SendSysMessage(LANG_BAD_VALUE); - handler->SetSentErrorMessage(true); - return false; - } - int32 offset = area->exploreFlag / 32; if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { @@ -1104,13 +1097,6 @@ public: return false; } - if (area->exploreFlag < 0) - { - handler->SendSysMessage(LANG_BAD_VALUE); - handler->SetSentErrorMessage(true); - return false; - } - int32 offset = area->exploreFlag / 32; if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { |