From 62ed044d08425bd09053bda18d56113bd9f9a2ce Mon Sep 17 00:00:00 2001 From: KingPin Date: Wed, 5 Nov 2008 09:22:56 -0600 Subject: [svn] *** Source Mangos *** *Load npc_options at server startup, use cached data at creature gossip menu init. * Also new .reload table command added *Implement npc_option localization support, also store in DB BoxText/BoxMoney/Coded * Use characters.guid instead low guid value from characters.data in charcter enum data prepering for client. * Fixed crash at .pinfo command use from console. * Fixed windows ad.exe build *Creature related code and DB cleanups. * Rename 2 creature_template fields to more clean names and related code update also. * Use enum values instead raw values for type_flags, use halper functions instead code repeating. * Move tamed pet creating code to new function. ** Small code changes to make things compliant with above changes. ** Another rev with big changes so test away. --HG-- branch : trunk --- src/game/World.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/game/World.cpp') diff --git a/src/game/World.cpp b/src/game/World.cpp index 0eefc688789..d02aa8a1f6f 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -982,6 +982,7 @@ void World::SetInitialWorldSettings() objmgr.LoadQuestLocales(); objmgr.LoadNpcTextLocales(); objmgr.LoadPageTextLocales(); + objmgr.LoadNpcOptionLocales(); objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts) sLog.outString( "Loading Page Texts..." ); @@ -1160,6 +1161,9 @@ void World::SetInitialWorldSettings() sLog.outString( "Loading Npc Text Id..." ); objmgr.LoadNpcTextId(); // must be after load Creature and NpcText + + sLog.outString( "Loading Npc Options..." ); + objmgr.LoadNpcOptions(); sLog.outString( "Loading vendors..." ); objmgr.LoadVendors(); // must be after load CreatureTemplate and ItemTemplate @@ -2472,7 +2476,10 @@ void World::UpdateSessions( time_t diff ) ///- Delete kicked sessions at add new session for (std::set::iterator itr = m_kicked_sessions.begin(); itr != m_kicked_sessions.end(); ++itr) + { + RemoveQueuedPlayer (*itr); delete *itr; + } m_kicked_sessions.clear(); ///- Then send an update signal to remaining ones -- cgit v1.2.3