diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-04-07 21:56:19 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-02-23 22:00:05 +0100 |
| commit | 8d1bb258fc4a777b2bd145efd9cadb22d4ec84a2 (patch) | |
| tree | 408161f067a32dfd63c8a1c52bbdd15104a5cc7e /src/server/game/Maps/Map.h | |
| parent | fd30618f12b3414e92acd0ffc8b196bfd295ce00 (diff) | |
Tools:
* 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
(cherry picked from commit 2c64bb97e6fddcbd15ef39fde3d0828bbf600ec6)
Diffstat (limited to 'src/server/game/Maps/Map.h')
| -rw-r--r-- | src/server/game/Maps/Map.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 66a588bdf00..cf02dfbcbf0 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -126,7 +126,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 : uint32 #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 { @@ -214,7 +214,8 @@ class TC_GAME_API GridMap uint8* _liquidFlags; float* _liquidMap; uint16 _gridArea; - uint16 _liquidType; + uint16 _liquidGlobalEntry; + uint8 _liquidGlobalFlags; uint8 _liquidOffX; uint8 _liquidOffY; uint8 _liquidWidth; |