Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

11 files changed, 180 insertions, 142 deletions

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3adfbf0339f..e86422e2ce1 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,130 +1,189 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-########### next target ###############
+########### worldserver ###############
 
-SET(trinity-core_SRCS
-CliRunnable.cpp
-CliRunnable.h
-Main.cpp
-Master.cpp
-Master.h
-RASocket.cpp
-RASocket.h
-WorldRunnable.cpp
-WorldRunnable.h
+set(worldserver_SRCS
+  CommandLine/CliRunnable.cpp
+  RemoteAccess/RASocket.cpp
+  WorldThread/WorldRunnable.cpp
+  Main.cpp
+  Master.cpp
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/externals/sockets/include
+  ${CMAKE_SOURCE_DIR}/externals/mersennetwister
   ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/shared/vmap
-  ${CMAKE_SOURCE_DIR}/src/server/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Policies
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
   ${CMAKE_SOURCE_DIR}/src/server/game
-  ${CMAKE_SOURCE_DIR}/src/server/game/Account
+  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
   ${CMAKE_SOURCE_DIR}/src/server/game/Addons
   ${CMAKE_SOURCE_DIR}/src/server/game/AI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
   ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI
   ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
   ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
   ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+  ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds/Zones
   ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
   ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Commands
   ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
   ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport
   ${CMAKE_SOURCE_DIR}/src/server/game/Events
   ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
   ${CMAKE_SOURCE_DIR}/src/server/game/Groups
   ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
   ${CMAKE_SOURCE_DIR}/src/server/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
   ${CMAKE_SOURCE_DIR}/src/server/game/Loot
   ${CMAKE_SOURCE_DIR}/src/server/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones
   ${CMAKE_SOURCE_DIR}/src/server/game/Pools
   ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/src/server/game/Quests
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
   ${CMAKE_SOURCE_DIR}/src/server/game/Skills
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
   ${CMAKE_SOURCE_DIR}/src/server/game/Tools
   ${CMAKE_SOURCE_DIR}/src/server/game/Weather
   ${CMAKE_SOURCE_DIR}/src/server/game/World
-  ${MYSQL_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/worldserver
+  ${CMAKE_SOURCE_DIR}/src/server/worldserver/CommandLine
+  ${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess
+  ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread
 )
 
-SET(trinity-core_LINK_FLAGS "")
+set(worldserver_LINK_FLAGS "")
 
-add_executable(trinity-core ${trinity-core_SRCS})
-add_definitions(
--D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
-)
-IF (DO_MYSQL)
-    SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
-ENDIF(DO_MYSQL)
+add_executable(worldserver ${worldserver_SRCS})
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(trinity-core_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
-    SET(SCRIPT_LIB "")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if( NOT WIN32 )
+  add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
+endif()
 
-SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
+add_dependencies(worldserver revision.h)
 
-if(DO_SCRIPTS)
-    SET(SCRIPT_LIB "scripts")
-else(DO_SCRIPTS)
-    SET(SCRIPT_LIB "")
-endif(DO_SCRIPTS)
-
-target_link_libraries(
-trinity-core
-game
-shared
-zlib
-trinityframework
-trinitysockets
-trinitydatabase
-trinityauth
-trinityconfig
-vmaps
-g3dlite
-jmalloc
-${SCRIPT_LIB}
-${READLINE_LIBRARY}
-${TERMCAP_LIBRARY}
-${MYSQL_LIBRARIES}
-${SSLLIB}
-${ACE_LIBRARY}
-${ZLIB} 
-${OSX_LIBS}
-)
+if( UNIX )
+  set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
+endif()
 
-install(TARGETS trinity-core DESTINATION bin)
+if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+  set(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
+  set(SCRIPT_LIB "")
+endif()
 
+set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
-########### install files ###############
+if( DO_SCRIPTS )
+  set(SCRIPT_LIB "scripts")
+else()
+  set(SCRIPT_LIB "")
+endif()
 
-install(FILES  trinitycore.conf.dist DESTINATION etc)
+if( WIN32 )
+  target_link_libraries(
+    worldserver
+    game
+    shared
+    zlib
+    trinitysockets
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    collision
+    g3dlib
+    ${SCRIPT_LIB}
+    ace
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${OPENSSL_EXTRA_LIBRARIES}
+  )
+else()
+  target_link_libraries(
+    worldserver
+    game
+    shared
+    trinitysockets
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    collision
+    g3dlib
+    jemalloc
+    ${SCRIPT_LIB}
+    ${READLINE_LIBRARY}
+    ${TERMCAP_LIBRARY}
+    ${ACE_LIBRARY}
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${ZLIB_LIBRARIES} 
+    ${OSX_LIBS}
+  )
+endif()
 
+if( UNIX )
+  install(TARGETS worldserver DESTINATION bin)
+  install(FILES   worldserver.conf.dist DESTINATION etc)
+endif()
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index b39faf694db..c72e454700c 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -26,7 +26,7 @@
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldSession.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 
 #include "AccountMgr.h"
 #include "Chat.h"
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 95bb39eca91..5166ca741df 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -28,16 +28,16 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 
 #include "Log.h"
 #include "Master.h"
 
 #ifndef _TRINITY_CORE_CONFIG
-# define _TRINITY_CORE_CONFIG  "TrinityCore.conf"
+# define _TRINITY_CORE_CONFIG  "worldserver.conf"
 #endif //_TRINITY_CORE_CONFIG
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 char serviceName[] = "TrinityCore";
 char serviceLongName[] = "Trinity core service";
@@ -62,7 +62,7 @@ void usage(const char *prog)
 {
     sLog.outString("Usage: \n %s [<options>]\n"
         "    -c config_file           use config_file as configuration file\n\r"
-        #ifdef WIN32
+        #ifdef _WIN32
         "    Running as service functions:\n\r"
         "    --service                run as service\n\r"
         "    -s install               install service\n\r"
@@ -91,7 +91,7 @@ extern int main(int argc, char **argv)
                 cfg_file = argv[c];
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         ////////////
         //Services//
         ////////////
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 8b34b512f57..f6f4260e303 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -31,9 +31,8 @@
 #include "WorldRunnable.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
 
 #include "CliRunnable.h"
 #include "Log.h"
@@ -42,26 +41,19 @@
 #include "Timer.h"
 #include "Util.h"
 
-#include "sockets/TcpSocket.h"
-#include "sockets/Utility.h"
-#include "sockets/Parse.h"
-#include "sockets/Socket.h"
-#include "sockets/SocketHandler.h"
-#include "sockets/ListenSocket.h"
-#include "Auth/BigNumber.h"
+#include "TcpSocket.h"
+#include "Utility.h"
+#include "Parse.h"
+#include "Socket.h"
+#include "SocketHandler.h"
+#include "ListenSocket.h"
+#include "BigNumber.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 extern int m_ServiceStatus;
 #endif
 
-/// \todo Warning disabling not useful under VC++2005. Can somebody say on which compiler it is useful?
-#pragma warning(disable:4305)
-
-INSTANTIATE_SINGLETON_1( Master );
-
-volatile uint32 Master::m_masterLoopCounter = 0;
-
 /// Handle cored's termination signals
 class CoredSignalHandler : public Trinity::SignalHandler
 {
@@ -94,42 +86,25 @@ public:
     void SetDelayTime(uint32 t) { _delaytime = t; }
     void run(void)
     {
-        if(!_delaytime)
+        if (!_delaytime)
             return;
         sLog.outString("Starting up anti-freeze thread (%u seconds max stuck time)...",_delaytime/1000);
         m_loops = 0;
         w_loops = 0;
         m_lastchange = 0;
         w_lastchange = 0;
-        while(!World::IsStopped())
+        while (!World::IsStopped())
         {
             ACE_Based::Thread::Sleep(1000);
             uint32 curtime = getMSTime();
-            //DEBUG_LOG("anti-freeze: time=%u, counters=[%u; %u]",curtime,Master::m_masterLoopCounter,World::m_worldLoopCounter);
-
-            // There is no Master anymore
-            // TODO: clear the rest of the code
-//            // normal work
-//            if(m_loops != Master::m_masterLoopCounter)
-//            {
-//                m_lastchange = curtime;
-//                m_loops = Master::m_masterLoopCounter;
-//            }
-//            // possible freeze
-//            else if(getMSTimeDiff(m_lastchange,curtime) > _delaytime)
-//            {
-//                sLog.outError("Main/Sockets Thread hangs, kicking out server!");
-//                *((uint32 volatile*)NULL) = 0;                       // bang crash
-//            }
-
             // normal work
-            if(w_loops != World::m_worldLoopCounter)
+            if (w_loops != World::m_worldLoopCounter)
             {
                 w_lastchange = curtime;
                 w_loops = World::m_worldLoopCounter;
             }
             // possible freeze
-            else if(getMSTimeDiff(w_lastchange,curtime) > _delaytime)
+            else if (getMSTimeDiff(w_lastchange,curtime) > _delaytime)
             {
                 sLog.outError("World Thread hangs, kicking out server!");
                 *((uint32 volatile*)NULL) = 0;                       // bang crash
@@ -285,7 +260,7 @@ int Master::Run()
 
     ACE_Based::Thread* cliThread = NULL;
 
-#ifdef WIN32
+#ifdef _WIN32
     if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
 #else
     if (sConfig.GetBoolDefault("Console.Enable", true))
@@ -298,7 +273,7 @@ int Master::Run()
     ACE_Based::Thread rar_thread(new RARunnable);
 
     ///- Handle affinity for multiple processors and process priority on Windows
-    #ifdef WIN32
+    #ifdef _WIN32
     {
         HANDLE hProcess = GetCurrentProcess();
 
@@ -386,7 +361,7 @@ int Master::Run()
 
     if (cliThread)
     {
-        #ifdef WIN32
+        #ifdef _WIN32
 
         // this only way to terminate CLI thread exist at Win32 (alt. way exist only in Windows Vista API)
         //_exit(1);
@@ -450,14 +425,14 @@ bool Master::_StartDB()
 
     ///- Get world database info from configuration file
     dbstring = sConfig.GetStringDefault("WorldDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
-        sLog.outError("Database not specified in configuration file");
+        sLog.outError("World database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the world database
-    if(!WorldDatabase.Initialize(dbstring.c_str()))
+    if( !WorldDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to world database %s",dbstring.c_str());
         return false;
@@ -465,14 +440,14 @@ bool Master::_StartDB()
 
     ///- Get character database info from configuration file
     dbstring = sConfig.GetStringDefault("CharacterDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
-        sLog.outError("Character Database not specified in configuration file");
+        sLog.outError("Character database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the Character database
-    if(!CharacterDatabase.Initialize(dbstring.c_str()))
+    if (!CharacterDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to Character database %s",dbstring.c_str());
         return false;
@@ -480,14 +455,14 @@ bool Master::_StartDB()
 
     ///- Get login database info from configuration file
     dbstring = sConfig.GetStringDefault("LoginDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
         sLog.outError("Login database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the login database
-    if(!LoginDatabase.Initialize(dbstring.c_str()))
+    if (!LoginDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to login database %s",dbstring.c_str());
         return false;
@@ -495,7 +470,7 @@ bool Master::_StartDB()
 
     ///- Get the realm Id from the configuration file
     realmID = sConfig.GetIntDefault("RealmID", 0);
-    if(!realmID)
+    if (!realmID)
     {
         sLog.outError("Realm ID not defined in configuration file");
         return false;
diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h
index 76ff2af1457..e8105705435 100644
--- a/src/server/worldserver/Master.h
+++ b/src/server/worldserver/Master.h
@@ -26,7 +26,6 @@
 #define _MASTER_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 
 /// Start the server
 class Master
@@ -35,7 +34,6 @@ class Master
         Master();
         ~Master();
         int Run();
-        static volatile uint32 m_masterLoopCounter;
 
     private:
         bool _StartDB();
@@ -43,6 +41,6 @@ class Master
         void clearOnlineAccounts();
 };
 
-#define sMaster Trinity::Singleton<Master>::Instance()
+#define sMaster (*ACE_Singleton<Master, ACE_Null_Mutex>::instance())
 #endif
 /// @}
diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index 32c16d9980f..35c2514b377 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "Common.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
 #include "AccountMgr.h"
 #include "Log.h"
@@ -254,7 +254,7 @@ void RASocket::zprint( const char * szText )
     unsigned int sz=strlen(megabuffer);
     Encrypt(megabuffer,sz);
     send(r,megabuffer,sz,0);
-    delete [] megabuffer;
+    free(megabuffer);
 
     #else
 
diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h
index 5c13724f90d..25a21d52044 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.h
+++ b/src/server/worldserver/RemoteAccess/RASocket.h
@@ -25,7 +25,7 @@
 #ifndef _RASOCKET_H
 #define _RASOCKET_H
 
-#include "sockets/TcpSocket.h"
+#include "TcpSocket.h"
 
 #include "Common.h"
 
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index c674ddbc06f..69639da62fa 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -35,7 +35,7 @@
 
 #define WORLD_SLEEP_CONST 50
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 extern int m_ServiceStatus;
 #endif
@@ -76,7 +76,7 @@ void WorldRunnable::run()
         else
             prevSleepTime = 0;
 
-        #ifdef WIN32
+        #ifdef _WIN32
             if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
             while (m_ServiceStatus == 2) Sleep(1000);
         #endif
@@ -90,7 +90,7 @@ void WorldRunnable::run()
 
     sWorldSocketMgr->StopNetwork();
 
-    MapManager::Instance().UnloadAll();                     // unload all grids (including locked in memory)
+    sMapMgr.UnloadAll();                     // unload all grids (including locked in memory)
 
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
diff --git a/src/server/worldserver/trinitycore.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 3b6d20e093d..8c53993d3f0 100644
--- a/src/server/worldserver/trinitycore.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -48,7 +48,7 @@
 RealmID = 1
 DataDir = "."
 LogsDir = ""
-LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;realmd"
+LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;auth"
 WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
 CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
 MaxPingTime = 30
@@ -177,7 +177,7 @@ EAIErrorLevel = 2
 #    
 #    vmap.enableIndoorCheck
 #        Enable/Disable VMap based indoor check to remove outdoor-only auras (mounts etc.)
-#        Default: 0 (disabled)
+#        Default: 1 (enabled)
 #
 #    DetectPosCollision
 #        Check final move position, summon position, etc for visible collision
@@ -244,10 +244,10 @@ PlayerSave.Stats.MinLevel = 0
 PlayerSave.Stats.SaveOnlyOnLogout = 1
 vmap.enableLOS = 0
 vmap.enableHeight = 0
-vmap.ignoreMapIds = "369"
+vmap.ignoreMapIds = ""
 vmap.ignoreSpellIds = "7720"
 vmap.petLOS = 0
-vmap.enableIndoorCheck = 0
+vmap.enableIndoorCheck = 1
 DetectPosCollision = 1
 TargetPosRecalculateRange = 1.5
 UpdateUptimeInterval = 10
@@ -811,6 +811,11 @@ ChatLogTimestamp = 0
 #        Default: 7
 #                -1 (show all available quests marks)
 #
+#    Quests.IgnoreRaid
+#        Allow non-raid quests to be completed when in raid group
+#        Default: 0 (false)
+#                 1 (true)
+#
 #    Guild.EventLogRecordsCount
 #        Count of guild event log records stored in guild_eventlog table
 #         Increase to store more guild events in table, minimum is 100
@@ -928,6 +933,7 @@ Instance.ResetTimeHour = 4
 Instance.UnloadDelay = 1800000
 Quests.LowLevelHideDiff = 4
 Quests.HighLevelHideDiff = 7
+Quests.IgnoreRaid = 0
 Guild.EventLogRecordsCount = 100
 Guild.BankEventLogRecordsCount = 25
 MaxPrimaryTradeSkill = 2
diff --git a/src/server/worldserver/TrinityCore.ico b/src/server/worldserver/worldserver.ico
index 6f0a5721957..6f0a5721957 100644
--- a/src/server/worldserver/TrinityCore.ico
+++ b/src/server/worldserver/worldserver.ico
diff --git a/src/server/worldserver/TrinityCore.rc b/src/server/worldserver/worldserver.rc
index 151185f3cec..939d6bdd355 100644
--- a/src/server/worldserver/TrinityCore.rc
+++ b/src/server/worldserver/worldserver.rc
@@ -36,7 +36,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_APPICON             ICON                    "TrinityCore.ico"
+IDI_APPICON             ICON                    "worldserver.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 // Neutre (Par défaut système) resources
@@ -69,12 +69,12 @@ BEGIN
     BEGIN
         BLOCK "080004b0"
         BEGIN
-            VALUE "FileDescription", "TrinityCore"
+            VALUE "FileDescription", "worldserver"
             VALUE "FileVersion", STRFILEVER
-            VALUE "InternalName", "TrinityCore"
-            VALUE "LegalCopyright", "Copyright (C) 2008-2009"
-            VALUE "OriginalFilename", "TrinityCore.exe"
-            VALUE "ProductName", "TrinityCore"
+            VALUE "InternalName", "worldserver"
+            VALUE "LegalCopyright", "Copyright (C) 2008-2010"
+            VALUE "OriginalFilename", "worldserver.exe"
+            VALUE "ProductName", "worldserver"
             VALUE "ProductVersion", STRPRODUCTVER
         END
     END