Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-11-04 18:28:39 +03:00
commit d4ab3ca463
25 changed files with 495 additions and 317 deletions

View file

@ -56,6 +56,7 @@
#include "CellImpl.h"
#include "InstanceSaveMgr.h"
#include "WaypointManager.h"
#include "GMTicketMgr.h"
#include "Util.h"
INSTANTIATE_SINGLETON_1( World );
@ -1134,6 +1135,9 @@ void World::SetInitialWorldSettings()
sLog.outString( "Loading Waypoints..." );
WaypointMgr.Load();
sLog.outString( "Loading GM tickets...");
ticketmgr.LoadGMTickets();
///- Handle outdated emails (delete/return)
sLog.outString( "Returning old mails..." );
objmgr.ReturnOrDeleteOldMails(false);