Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Better reset time format in command .lookup map

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-06-19 09:00:29 +02:00
parent efe02a5e36
commit 609986afed
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/4176_world.sql Normal file
View File

@@ -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;

4
sql/world.sql
View File

@@ -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),

13
src/game/Level3.cpp
View File

@@ -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());