diff options
| author | maximius <none@none> | 2009-09-14 16:48:38 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-14 16:48:38 -0700 |
| commit | 33f8f5ac2d2b99819ce7e0f4aad4fa0648eba35e (patch) | |
| tree | 1aec6ee2ee29717b8f6d582962abdeb450fd81d9 /src/game/Map.cpp | |
| parent | eb44ad818e365f8e603a36e12d8b4f61fd3b5f50 (diff) | |
| parent | 7349c1d9dd7ff2331d5059595f3e81dfc097f071 (diff) | |
*Merge..
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index ad322868c61..2fba8c37d2c 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1870,8 +1870,8 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const // Makers' Overlook (ground and cave) else if (x > 5634.48f && x < 5774.53f && y < 3475.0f && z > 300.0f) { - if(y > 3380.26f || y > 3265.0f && z < 360.0f) - areaflag = 2187; + if(y > 3380.26f || y > 3265.0f && z < 360.0f) + areaflag = 2187; } break; // The Makers' Perch (underground) |