Merge pull request #14405 from ariel-/gpsfix

Crash fix in .gps command
This commit is contained in:
Denis committed 2015-03-19 10:49:21 +01:00
commit 9a1db399d9
3 files changed
+8 -2

No files matched your search

@@ -0,0 +1,4 @@
UPDATE `trinity_string` SET `content_default` = 'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f' WHERE `entry` = 101;
DELETE FROM `trinity_string` WHERE `entry` = 178;
INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
(178, 'grid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u MMap: %u)');
+2 -1
View File
@@ -207,7 +207,8 @@ enum TrinityStrings
LANG_LIQUID_STATUS = 175, LANG_LIQUID_STATUS = 175,
LANG_INVALID_GAMEOBJECT_TYPE = 176, LANG_INVALID_GAMEOBJECT_TYPE = 176,
LANG_GAMEOBJECT_DAMAGED = 177, LANG_GAMEOBJECT_DAMAGED = 177,
// Room for more level 1 178-199 not used LANG_GRID_POSITION = 178,
// Room for more level 1 179-199 not used
// level 2 chat // level 2 chat
LANG_NO_SELECTION = 200, LANG_NO_SELECTION = 200,
+2 -1
View File
@@ -237,7 +237,8 @@ public:
zoneId, (zoneEntry ? zoneEntry->area_name[handler->GetSessionDbcLocale()] : unknown), zoneId, (zoneEntry ? zoneEntry->area_name[handler->GetSessionDbcLocale()] : unknown),
areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : unknown), areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : unknown),
object->GetPhaseMask(), object->GetPhaseMask(),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
handler->PSendSysMessage(LANG_GRID_POSITION,
cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(), cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(),
zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap); zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);