Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

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;
 }