Created
January 3, 2013 11:28
-
-
Save cyberium/4442819 to your computer and use it in GitHub Desktop.
Liquid problem, remove a bad old hack.
Causing ocean is lava in start drenei start zone.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp | |
index 3bf9f0e..51dab15 100644 | |
--- a/src/game/GridMap.cpp | |
+++ b/src/game/GridMap.cpp | |
@@ -952,10 +952,6 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint | |
// All ok in water -> store data | |
if (data) | |
{ | |
- // hardcoded in client like this convert ocean to lava | |
- if (GetMapId() == 530 && liquid_type == 2) | |
- liquid_type = 3; | |
- | |
uint32 liquidFlagType = 0; | |
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquid_type)) | |
liquidFlagType = 1 << liq->Type; | |
@@ -988,15 +984,7 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint | |
if (map_result != LIQUID_MAP_NO_WATER && (map_data.level > ground_level)) | |
{ | |
if (data) | |
- { | |
- // hardcoded in client like this | |
- if (GetMapId() == 530 && map_data.entry == 2) | |
- { | |
- map_data.entry = 3; | |
- map_data.type_flags = MAP_LIQUID_TYPE_MAGMA; | |
- } | |
*data = map_data; | |
- } | |
return map_result; | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment