diff options
| -rw-r--r-- | sql/4176_world.sql | 2 | ||||
| -rw-r--r-- | sql/world.sql | 4 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sql/4176_world.sql b/sql/4176_world.sql new file mode 100644 index 00000000000..3ba9e7a8ae1 --- /dev/null +++ b/sql/4176_world.sql @@ -0,0 +1,2 @@ +UPDATE `trinity_string` SET `content_default` = '[Raid reset time: %s]' WHERE `entry` = 5017; +UPDATE `trinity_string` SET `content_default` = '[Heroic reset time: %s]' WHERE `entry` = 5018; diff --git a/sql/world.sql b/sql/world.sql index 5063a6c20f0..c6b2f00c670 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -15410,8 +15410,8 @@ INSERT INTO `trinity_string` VALUES (5014,'[Instance]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (5015,'[Battleground]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (5016,'[Arena]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(5017,'[Raid reset time: %u]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(5018,'[Heroic reset time: %u]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5017,'[Raid reset time: %s]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5018,'[Heroic reset time: %s]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (5019,'[Mountable]',NULL NULL,NULL,NULL,NULL,NULL,NULL,NULL), (6613,'|cfff00000[GM Announcement]: %s|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (6614,'Notification to GM\'s - ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 849565cc030..adb904dbbbe 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -3871,17 +3871,24 @@ bool ChatHandler::HandleLookupMapCommand(const char* args) ss << GetTrinityString(LANG_HEROIC); uint32 ResetTimeRaid = MapInfo->resetTimeRaid; + std::string ResetTimeRaidStr; + if(ResetTimeRaid) + ResetTimeRaidStr = secsToTimeString(ResetTimeRaid, true, false); + uint32 ResetTimeHeroic = MapInfo->resetTimeHeroic; + std::string ResetTimeHeroicStr; + if(ResetTimeHeroic) + ResetTimeHeroicStr = secsToTimeString(ResetTimeHeroic, true, false); if(MapInfo->IsMountAllowed()) ss << GetTrinityString(LANG_MOUNTABLE); if(ResetTimeRaid && !ResetTimeHeroic) - PSendSysMessage(ss.str().c_str(), ResetTimeRaid); + PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str()); else if(!ResetTimeRaid && ResetTimeHeroic) - PSendSysMessage(ss.str().c_str(), ResetTimeHeroic); + PSendSysMessage(ss.str().c_str(), ResetTimeHeroicStr.c_str()); else if(ResetTimeRaid && ResetTimeHeroic) - PSendSysMessage(ss.str().c_str(), ResetTimeRaid, ResetTimeHeroic); + PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str(), ResetTimeHeroicStr.c_str()); else SendSysMessage(ss.str().c_str()); |