aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-04-07 21:56:19 +0200
committerShauren <shauren.trinity@gmail.com>2018-04-07 21:56:19 +0200
commit2c64bb97e6fddcbd15ef39fde3d0828bbf600ec6 (patch)
tree27f9cf5bbfa3693a33b2289da36e5f6307001ce0 /src/server/game/Maps/Map.h
parent5c7a5ddcf4735a38c76ae16b416abff2dc94fb62 (diff)
Tools:
* mapextractor - fixed fatigue in Thousand Needles * mapextractor - fixed compressing liquid data * vmapextractor - fixed extracting liquids inside WMOs * vmapextractor - implemented new WMO flags * vmapextractor - store model type for gameobject models * mmap_generator - fixed processing liquids broken in e5d23103f37c40d2e946fa0e2db66d2f527ad9af
Diffstat (limited to 'src/server/game/Maps/Map.h')
-rw-r--r--src/server/game/Maps/Map.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 302252acaac..a459c653af7 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -129,7 +129,8 @@ struct map_heightHeader
struct map_liquidHeader
{
uint32 fourcc;
- uint16 flags;
+ uint8 flags;
+ uint8 liquidFlags;
uint16 liquidType;
uint8 offsetX;
uint8 offsetY;
@@ -156,7 +157,6 @@ enum ZLiquidStatus
#define MAP_ALL_LIQUIDS (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)
#define MAP_LIQUID_TYPE_DARK_WATER 0x10
-#define MAP_LIQUID_TYPE_WMO_WATER 0x20
struct LiquidData
{
@@ -193,7 +193,8 @@ class TC_GAME_API GridMap
uint8* _liquidFlags;
float* _liquidMap;
uint16 _gridArea;
- uint16 _liquidType;
+ uint16 _liquidGlobalEntry;
+ uint8 _liquidGlobalFlags;
uint8 _liquidOffX;
uint8 _liquidOffY;
uint8 _liquidWidth;