From 6438bf557f52cef1e4ee1caf63a5d3fd971e0a8a Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 12 Apr 2009 13:43:16 +0400 Subject: [PATCH] [7656] Implement hack way detection for more cave and not cave areas at new continent. --- src/game/Map.cpp | 31 +++++++++++++++++++++++++++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 07910e79b..0db29f022 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1671,6 +1671,37 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const if (x > 1299.0f && x < 1839.0f && y > 10.0f && y < 440.0f) areaflag = 685; } break; + // The Makers' Perch (ground) and Makers' Overlook (ground and cave) + case 1335: // Sholazar Basin + // The Makers' Perch ground (fast box) + if (x > 6100.0f && x < 6250.0f && y > 5650.0f && y < 5800.0f) + { + // nice slow circle + if ((x-6183.0f)*(x-6183.0f)+(y-5717.0f)*(y-5717.0f) < 2500.0f) + areaflag = 2189; + } + // 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; + } + break; + // The Makers' Perch (underground) + case 2147: // The Stormwright's Shelf (Sholazar Basin) + if (x > 6199.0f && x < 6283.0f && y > 5705.0f && y < 5817.0f && z < 38.0f) areaflag = 2189; break; + // Makers' Overlook (deep cave) + case 267: // Icecrown + if (x > 5684.0f && x < 5798.0f && y > 3035.0f && y < 3367.0f && z < 358.0f) areaflag = 2187; break; + // Wyrmrest Temple (Dragonblight) + case 1814: // Path of the Titans (Dragonblight) + case 1897: // The Dragon Wastes (Dragonblight) + // fast box + if (x > 3400.0f && x < 3700.0f && y > 130.0f && y < 420.0f) + { + // nice slow circle + if ((x-3546.87f)*(x-3546.87f)+(y-272.71f)*(y-272.71f) < 19600.0f) areaflag = 1791; + } + break; } return areaflag; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8e3a54bd0..a17c844ea 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7655" + #define REVISION_NR "7656" #endif // __REVISION_NR_H__