diff options
| -rw-r--r-- | sql/updates/6966_world_trinity_string.sql | 1 | ||||
| -rw-r--r-- | sql/world.sql | 2 | ||||
| -rw-r--r-- | src/game/Level2.cpp | 11 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sql/updates/6966_world_trinity_string.sql b/sql/updates/6966_world_trinity_string.sql new file mode 100644 index 00000000000..0650be536bb --- /dev/null +++ b/sql/updates/6966_world_trinity_string.sql @@ -0,0 +1 @@ +UPDATE `trinity_string` SET `content_default` = 'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f\nPhasemask %u' WHERE `entry`=524; diff --git a/sql/world.sql b/sql/world.sql index ab5ef584578..427972af644 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -7310,7 +7310,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (521, '%d - |cffffffff|Hskill:%d|h[%s %s]|h|r %s %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (522, 'Game Object (Entry: %u) not found', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (523, '>> Game Object %s (GUID: %u) at %f %f %f. Orientation %f.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(524, 'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(524, 'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f\nPhasemask %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (525, '>> Add Game Object ''%i'' (%s) (GUID: %i) added at ''%f %f %f''.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (526, '%s (lowguid: %u) movement generators stack:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (527, ' Idle', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 398b3d0020c..f93b7fc326a 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -448,14 +448,14 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) uint32 id = atol(cId); if(id) - result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", + result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id); else { std::string name = cId; WorldDatabase.escape_string(name); result = WorldDatabase.PQuery( - "SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ " + "SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ " "FROM gameobject,gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" ORDER BY order_ ASC LIMIT 1", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),name.c_str()); } @@ -482,7 +482,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) else eventFilter << ")"; - result = WorldDatabase.PQuery("SELECT gameobject.guid, id, position_x, position_y, position_z, orientation, map, " + result = WorldDatabase.PQuery("SELECT gameobject.guid, id, position_x, position_y, position_z, orientation, map, phaseMask, " "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject " "LEFT OUTER JOIN game_event_gameobject on gameobject.guid=game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10", m_session->GetPlayer()->GetPositionX(), m_session->GetPlayer()->GetPositionY(), m_session->GetPlayer()->GetPositionZ(), m_session->GetPlayer()->GetMapId(),eventFilter.str().c_str()); @@ -497,7 +497,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) bool found = false; float x, y, z, o; uint32 lowguid, id; - uint16 mapid, pool_id; + uint16 mapid, pool_id, phase; do { @@ -509,6 +509,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) z = fields[4].GetFloat(); o = fields[5].GetFloat(); mapid = fields[6].GetUInt16(); + phase = fields[7].GetUInt16(); pool_id = poolhandler.IsPartOfAPool(lowguid, TYPEID_GAMEOBJECT); if (!pool_id || (pool_id && poolhandler.IsSpawnedObject(pool_id, lowguid, TYPEID_GAMEOBJECT))) found = true; @@ -532,7 +533,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) GameObject* target = m_session->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid,id,HIGHGUID_GAMEOBJECT)); - PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name, lowguid, id, x, y, z, mapid, o); + PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name, lowguid, id, x, y, z, mapid, o, phase); if(target) { |