From 81e2f4ab89f48408479019a4dc017e638779f848 Mon Sep 17 00:00:00 2001 From: Chaz Brown Date: Tue, 7 Apr 2009 02:53:48 -0400 Subject: Fix typo in characters.sql --HG-- branch : trunk --- sql/characters.sql | 1 - 1 file changed, 1 deletion(-) (limited to 'sql') diff --git a/sql/characters.sql b/sql/characters.sql index fc9da398cfe..55a8796e6e4 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -1413,7 +1413,6 @@ LOCK TABLES `petition_sign` WRITE; /*!40000 ALTER TABLE `petition_sign` DISABLE KEYS */; /*!40000 ALTER TABLE `petition_sign` ENABLE KEYS */; UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; -- -- Table structure for table `saved_variables` -- cgit v1.2.3 From 230b3d41ef5197fb99119da72792984ba192c891 Mon Sep 17 00:00:00 2001 From: Anubisss Date: Tue, 7 Apr 2009 18:01:22 +0200 Subject: *Use constant LANG_INSTANCE_RAID_GROUP_ONLY in a message which in CanPlayerEnter(). --HG-- branch : trunk --- sql/updates/2479_world.sql | 2 ++ src/game/Language.h | 2 +- src/game/MapManager.cpp | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 sql/updates/2479_world.sql (limited to 'sql') diff --git a/sql/updates/2479_world.sql b/sql/updates/2479_world.sql new file mode 100644 index 00000000000..e5f0e2fb772 --- /dev/null +++ b/sql/updates/2479_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry` = 5007; +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/src/game/Language.h b/src/game/Language.h index 07985f62bd2..51df64227f8 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -842,7 +842,7 @@ enum TrinityStrings LANG_COMMAND_NO_FROZEN_PLAYERS = 5004, LANG_COMMAND_LIST_FREEZE = 5005, LANG_COMMAND_FROZEN_PLAYERS = 5006, - //LANG_INSTANCE_MUST_RAID_GRP = 5007, + LANG_INSTANCE_RAID_GROUP_ONLY = 5007, //LANG_INSTANCE_NOT_AS_GHOST = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, // Room for more Trinity strings 5010-9999 diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index e083302e045..061e0252a13 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -32,6 +32,7 @@ #include "CellImpl.h" #include "Corpse.h" #include "ObjectMgr.h" +#include "Language.h" #define CLASS_LOCK Trinity::ClassLevelLockable INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK); @@ -165,7 +166,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player) { // probably there must be special opcode, because client has this string constant in GlobalStrings.lua // TODO: this is not a good place to send the message - player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(810), mapName); + player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); sLog.outDebug("MAP: Player '%s' must be in a raid group to enter instance of '%s'", player->GetName(), mapName); return false; } -- cgit v1.2.3