diff --git a/sql/mangos.sql b/sql/mangos.sql index d83e9b9c4..1c650abd3 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_9755_01_mangos_instance_template` bit(1) default NULL + `required_9761_01_mangos_mangos_string` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -3616,6 +3616,7 @@ INSERT INTO `mangos_string` VALUES (1134,' Follow ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1135,'List known talents:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1136,' (Found talents: %u used talent points: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1137,'%d - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1200,'You try to view cinemitic %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1201,'You try to view movie %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `mangos_string` ENABLE KEYS */; diff --git a/sql/updates/9761_01_mangos_mangos_string.sql b/sql/updates/9761_01_mangos_mangos_string.sql new file mode 100644 index 000000000..acdb8426b --- /dev/null +++ b/sql/updates/9761_01_mangos_mangos_string.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_9755_01_mangos_instance_template required_9761_01_mangos_mangos_string bit; + +DELETE FROM mangos_string WHERE entry=1137; +INSERT INTO mangos_string VALUES (1137,'%d - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index c0550a216..09d464a21 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -125,6 +125,7 @@ pkgdata_DATA = \ 9752_01_mangos_gameobject_template.sql \ 9753_01_mangos_instance_template.sql \ 9755_01_mangos_instance_template.sql \ + 9761_01_mangos_mangos_string.sql \ README ## Additional files to include when running 'make dist' @@ -230,4 +231,5 @@ EXTRA_DIST = \ 9752_01_mangos_gameobject_template.sql \ 9753_01_mangos_instance_template.sql \ 9755_01_mangos_instance_template.sql \ + 9761_01_mangos_mangos_string.sql \ README diff --git a/src/game/Language.h b/src/game/Language.h index 2802c687e..c67f100d1 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -480,7 +480,7 @@ enum MangosStrings LANG_CREATURE_ENTRY_LIST_CHAT = 514, LANG_CREATURE_LIST_CHAT = 515, LANG_GO_ENTRY_LIST_CHAT = 516, - LANG_GO_LIST_CHAT = 517, + LANG_GO_MIXED_LIST_CHAT = 517, LANG_ITEMSET_LIST_CHAT = 518, LANG_TELE_LIST = 519, LANG_SPELL_LIST = 520, @@ -821,7 +821,8 @@ enum MangosStrings LANG_MOVEGENS_FOLLOW_NULL = 1134, LANG_LIST_TALENTS_TITLE = 1135, LANG_LIST_TALENTS_COUNT = 1136, - // Room for more level 3 1137-1199 not used + LANG_GO_LIST_CHAT = 1137, + // Room for more level 3 1138-1199 not used // Debug commands LANG_CINEMATIC_NOT_EXIST = 1200, diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 9c524e736..a7edb00b3 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -831,7 +831,7 @@ bool ChatHandler::HandleGameObjectNearCommand(const char* args) if(!gInfo) continue; - PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name, x, y, z, mapid); + PSendSysMessage(LANG_GO_MIXED_LIST_CHAT, guid, entry, guid, gInfo->name, x, y, z, mapid); ++count; } while (result->NextRow()); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index db752fe88..2412cb128 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -2572,7 +2572,7 @@ bool ChatHandler::HandleListObjectCommand(const char* args) int mapid = fields[4].GetUInt16(); if (m_session) - PSendSysMessage(LANG_GO_LIST_CHAT, guid, gInfo->id, guid, gInfo->name, x, y, z, mapid); + PSendSysMessage(LANG_GO_LIST_CHAT, guid, guid, gInfo->name, x, y, z, mapid); else PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, gInfo->name, x, y, z, mapid); } while (result->NextRow()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9443f516d..df4eb405b 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 "9760" + #define REVISION_NR "9761" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 9e9f22ffc..4279c833e 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_9751_01_characters" - #define REVISION_DB_MANGOS "required_9755_01_mangos_instance_template" + #define REVISION_DB_MANGOS "required_9761_01_mangos_mangos_string" #define REVISION_DB_REALMD "required_9748_01_realmd_realmlist" #endif // __REVISION_SQL_H__