Fixed some merging errors, there could be more, but at least it compiles.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 7c431566f52..2deac95d287 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -135,7 +135,7 @@ public:
         else

             handler->PSendSysMessage("no VMAP available for area info");

 

-        handler->PSendSysMessage(LANG_MAP_POSITION,

+        /*handler->PSendSysMessage(LANG_MAP_POSITION,

             object->GetMapId(), (mapEntry ? mapEntry->name[handler->GetSessionDbcLocale()] : "<unknown>"),

             zoneId, (zoneEntry ? zoneEntry->area_name[handler->GetSessionDbcLocale()] : "<unknown>"),

             areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : "<unknown>"),

@@ -143,6 +143,7 @@ public:
             object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(),

             cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(),

             zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap);

+        */

 

         LiquidData liquidStatus;

         ZLiquidStatus status = map->getLiquidStatus(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), MAP_ALL_LIQUIDS, &liquidStatus);