-Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly.

-Merc unsuspend timers should now be more reliable across zone shutdown.
This commit is contained in:
SecretsOTheP
2013-03-23 04:58:03 -04:00
parent ac040b5197
commit abaad22eb4
6 changed files with 31 additions and 33 deletions
+1 -1
View File
@@ -1124,7 +1124,7 @@ public:
void UpdateMercTimer();
void UpdateMercLevel();
void CheckMercSuspendTimer();
Timer GetMercTimer() { return merc_timer; };
Timer* GetMercTimer() { return &merc_timer; };
const char* GetRacePlural(Client* client);
const char* GetClassPlural(Client* client);
void SendWebLink(const char* website);