aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-10 15:33:54 -0600
committermegamage <none@none>2009-03-10 15:33:54 -0600
commitdc4a456416870697d1bf727ab5c7b9f6cf3537f0 (patch)
treef71b84de473b1cf364899169c6c4cfa2dcae9a00 /src
parent099d302e690cf767c9247f7a910d86286af4745f (diff)
[7439] Fix wrong liquid level in some places. Need reectract maps. Author: DiSlord
Remove some log on extract maps. Add liquid status log to .gps command --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Language.h3
-rw-r--r--src/game/Level1.cpp6
-rw-r--r--src/game/Map.h2
-rw-r--r--src/shared/revision_nr.h2
4 files changed, 10 insertions, 3 deletions
diff --git a/src/game/Language.h b/src/game/Language.h
index be303c294e4..4662017110e 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -172,7 +172,8 @@ enum TrinityStrings
LANG_CONSOLE_COMMAND = 172,
LANG_YOU_CHANGE_RUNIC_POWER = 173,
LANG_YOURS_RUNIC_POWER_CHANGED = 174,
- // Room for more level 1 175-199 not used
+ LANG_LIQUID_STATUS = 175,
+ // Room for more level 1 176-199 not used
// level 2 chat
LANG_NO_SELECTION = 200,
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 78e32e62574..346547e0c4b 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -733,6 +733,12 @@ bool ChatHandler::HandleGPSCommand(const char* args)
cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
zone_x, zone_y, ground_z, floor_z, have_map, have_vmap );
+ LiquidData liquid_status;
+ ZLiquidStatus res = map->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status);
+ if (res)
+ {
+ PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.type, res);
+ }
return true;
}
diff --git a/src/game/Map.h b/src/game/Map.h
index 0d03970e102..3a2c4e8e2fd 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -74,7 +74,7 @@ typedef Trinity::SingleThreaded<GridRWLock>::Lock NullGuard;
// Map file format defines
//******************************************
#define MAP_MAGIC 'SPAM'
-#define MAP_VERSION_MAGIC '0.1v'
+#define MAP_VERSION_MAGIC '0.1w'
#define MAP_AREA_MAGIC 'AERA'
#define MAP_HEIGTH_MAGIC 'TGHM'
#define MAP_LIQUID_MAGIC 'QILM'
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 838a591c8f1..b4cca70987c 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 "7438"
+ #define REVISION_NR "7439"
#endif // __REVISION_NR_H__