diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-03-07 13:09:35 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-03-07 13:09:35 +0100 |
| commit | e5d23103f37c40d2e946fa0e2db66d2f527ad9af (patch) | |
| tree | 4970c3f8fcb3e39bd433084113e7653739e3f5b9 /src/server/collision/Models | |
| parent | 9f93681625f16b4a118df755eccb8ac80f713c16 (diff) | |
Core/Maps
* Corrected liquid type extraction in maps - MCLQ chunk must be parsed together with MH2O (they stack)
* Fixed liquid detection in WMO objects
* Implemented LiquidType.dbc use, players will now get proper auras in special liquids
* Turned off slime damage by default (Naxxramas uses periodic damage aura for this purpose)
* Implemented liquid type overrides basing on area/zone
* Renamed final temp_gameobject_models to GameObjectModels.dtree (the temporary one produced by vmap extractor remains unaffected)
Note: Map and Vmap re-extraction is required
Diffstat (limited to 'src/server/collision/Models')
| -rw-r--r-- | src/server/collision/Models/WorldModel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index d4b08dde5dd..b818232fb32 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -392,9 +392,8 @@ namespace VMAP uint32 GroupModel::GetLiquidType() const { - // convert to type mask, matching MAP_LIQUID_TYPE_* defines in Map.h if (iLiquid) - return (1 << iLiquid->GetType()); + return iLiquid->GetType(); return 0; } |
