From 74b3fb53c06f98d29c5fe069d6a6250833c21c71 Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Mon, 7 Jun 2010 12:13:15 +0200
Subject: Some fixes for shared/CMakeLists.txt Adjust game/CMakeLists.txt to
 the new structure (needs more work)

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index ed43a4eb6cd..5e0a2f40adf 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,7 +1,14 @@
-add_subdirectory(vmap)
-add_subdirectory(Auth)
-add_subdirectory(Config)
+add_subdirectory(Configuration)
+add_subdirectory(Cryptography)
 add_subdirectory(Database)
+add_subdirectory(DataStores)
+add_subdirectory(Debugging)
+add_subdirectory(Dynamic)
+add_subdirectory(Logging)
+add_subdirectory(Packets)
+add_subdirectory(Policies)
+add_subdirectory(Threading)
+add_subdirectory(Utilities)
 
 ########### next target ###############
 
@@ -30,7 +37,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/dep/include/sockets
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${MYSQL_INCLUDE_DIR}
 )
-- 
cgit v1.2.3


From ce1b22ed0c4cd86783848cad9dfa54fbc1bf9a4b Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Mon, 7 Jun 2010 12:41:57 +0200
Subject: More cmake fixes. Now cmake runs without errors with -DO_SCRIPTS=0

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt          |   18 +-
 src/server/game/CMakeLists.txt                |    6 +-
 src/server/scripts/CMakeLists.txt             | 1120 ++++++++++++-------------
 src/server/shared/CMakeLists.txt              |   28 +-
 src/server/shared/Cryptography/CMakeLists.txt |   21 +-
 src/server/shared/Database/CMakeLists.txt     |    7 +-
 src/server/worldserver/CMakeLists.txt         |   14 +-
 7 files changed, 605 insertions(+), 609 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 5a993be5377..496f1ff689e 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,16 +1,16 @@
 ########### next target ###############
 
 SET(trinity-realm_SRCS
-AuthCodes.cpp
-AuthCodes.h
-AuthSocket.cpp
-AuthSocket.h
+Authentication/AuthCodes.cpp
+Authentication/AuthCodes.h
+Realms/RealmList.cpp
+Realms/RealmList.h
+Server/AuthSocket.cpp
+Server/AuthSocket.h
+Server/RealmSocket.h
+Server/RealmSocket.cpp
+Server/RealmAcceptor.h
 Main.cpp
-RealmList.cpp
-RealmList.h
-RealmSocket.h
-RealmSocket.cpp
-RealmAcceptor.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 553d95b447d..444f181f4a9 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -372,8 +372,6 @@ if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
       AI/ScriptedAI/ScriptedEscortAI.cpp
       AI/ScriptedAI/ScriptedEscortAI.h
-      ScriptMgr/ScriptedPch.cpp
-      ScriptMgr/ScriptedPch.h
       AI/ScriptedAI/ScriptedCreature.cpp
       AI/ScriptedAI/ScriptedCreature.h
       AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -384,6 +382,8 @@ if(NOT DO_SCRIPTS)
       AI/ScriptedAI/ScriptedInstance.h
       AI/ScriptedAI/ScriptedSimpleAI.cpp
       AI/ScriptedAI/ScriptedSimpleAI.h
+      PrecompiledHeaders/ScriptPCH.cpp
+      PrecompiledHeaders/ScriptPCH.h
    )
    message("-- Added Script Engine to GAME lib")
 endif(NOT DO_SCRIPTS)
@@ -393,6 +393,6 @@ ADD_DEPENDENCIES(game revision.h)
 
 # Generate precompiled header
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/pchlinux.h)
+        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index d29670e4fc9..b9dfbc5fab2 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -4,8 +4,8 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 SET(scripts_STAT_SRCS
-   ../game/ScriptMgr/ScriptedPch.cpp
-   ../game/ScriptMgr/ScriptedPch.h
+   ../game/Scripting/ScriptedPch.cpp
+   ../game/Scripting/ScriptedPch.h
    ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
    ../game/AI/ScriptedAI/ScriptedEscortAI.h
    ../game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -18,564 +18,564 @@ SET(scripts_STAT_SRCS
    ../game/AI/ScriptedAI/ScriptedInstance.h
    ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
    ../game/AI/ScriptedAI/ScriptedSimpleAI.h
-   custom/on_events.cpp
-   eastern_kingdoms/alterac_valley/alterac_valley.cpp
-   eastern_kingdoms/alterac_valley/boss_balinda.cpp
-   eastern_kingdoms/alterac_valley/boss_drekthar.cpp
-   eastern_kingdoms/alterac_valley/boss_galvangar.cpp
-   eastern_kingdoms/alterac_valley/boss_vanndar.cpp
-   eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
-   eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
-   eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
-   eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
-   eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
-   eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
-   eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
-   eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
-   eastern_kingdoms/blackrock_depths/boss_magmus.cpp
-   eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
-   eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
-   eastern_kingdoms/blackrock_depths/blackrock_depths.h
-   eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
-   eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
-   eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
-   eastern_kingdoms/blackrock_spire/boss_gyth.cpp
-   eastern_kingdoms/blackrock_spire/boss_halycon.cpp
-   eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
-   eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
-   eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
-   eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
-   eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
-   eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
-   eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
-   eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
-   eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
-   eastern_kingdoms/blackrock_spire/blackrock_spire.h
-   eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
-   eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
-   eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
-   eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
-   eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
-   eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
-   eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
-   eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
-   eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
-   eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
-   eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp
-   eastern_kingdoms/deadmines/boss_mr_smite.cpp
-   eastern_kingdoms/deadmines/deadmines.h
-   eastern_kingdoms/deadmines/deadmines.cpp
-   eastern_kingdoms/deadmines/instance_deadmines.cpp
-   eastern_kingdoms/gnomeregan/gnomeregan.h
-   eastern_kingdoms/gnomeregan/gnomeregan.cpp
-   eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
-   eastern_kingdoms/karazhan/boss_curator.cpp
-   eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
-   eastern_kingdoms/karazhan/boss_midnight.cpp
-   eastern_kingdoms/karazhan/boss_moroes.cpp
-   eastern_kingdoms/karazhan/boss_netherspite.cpp
-   eastern_kingdoms/karazhan/boss_nightbane.cpp
-   eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
-   eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
-   eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
-   eastern_kingdoms/karazhan/bosses_opera.cpp
-   eastern_kingdoms/karazhan/karazhan.h
-   eastern_kingdoms/karazhan/instance_karazhan.cpp
-   eastern_kingdoms/karazhan/karazhan.cpp
-   eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
-   eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
-   eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
-   eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
-   eastern_kingdoms/magisters_terrace/magisters_terrace.h
-   eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
-   eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
-   eastern_kingdoms/molten_core/boss_baron_geddon.cpp
-   eastern_kingdoms/molten_core/boss_garr.cpp
-   eastern_kingdoms/molten_core/boss_gehennas.cpp
-   eastern_kingdoms/molten_core/boss_golemagg.cpp
-   eastern_kingdoms/molten_core/boss_lucifron.cpp
-   eastern_kingdoms/molten_core/boss_magmadar.cpp
-   eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
-   eastern_kingdoms/molten_core/boss_ragnaros.cpp
-   eastern_kingdoms/molten_core/boss_shazzrah.cpp
-   eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
-   eastern_kingdoms/molten_core/molten_core.h
-   eastern_kingdoms/molten_core/instance_molten_core.cpp
-   eastern_kingdoms/molten_core/molten_core.cpp
-   eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
-   eastern_kingdoms/scarlet_enclave/chapter1.cpp
-   eastern_kingdoms/scarlet_enclave/chapter2.cpp
-   eastern_kingdoms/scarlet_enclave/chapter5.cpp
-   eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
-   eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
-   eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
-   eastern_kingdoms/scarlet_monastery/boss_herod.cpp
-   eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
-   eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
-   eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
-   eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
-   eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
-   eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
-   eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
-   eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
-   eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
-   eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
-   eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
-   eastern_kingdoms/scholomance/boss_illucia_barov.cpp
-   eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
-   eastern_kingdoms/scholomance/boss_jandice_barov.cpp
-   eastern_kingdoms/scholomance/boss_kormok.cpp
-   eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
-   eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
-   eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
-   eastern_kingdoms/scholomance/boss_the_ravenian.cpp
-   eastern_kingdoms/scholomance/boss_vectus.cpp
-   eastern_kingdoms/scholomance/scholomance.h
-   eastern_kingdoms/scholomance/instance_scholomance.cpp
-   eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
-   eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
-   eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
-   eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
-   eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
-   eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
-   eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
-   eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
-   eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
-   eastern_kingdoms/stratholme/boss_nerubenkan.cpp
-   eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
-   eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
-   eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
-   eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
-   eastern_kingdoms/stratholme/stratholme.h
-   eastern_kingdoms/stratholme/instance_stratholme.cpp
-   eastern_kingdoms/stratholme/stratholme.cpp
-   eastern_kingdoms/sunken_temple/sunken_temple.h
-   eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
-   eastern_kingdoms/sunken_temple/sunken_temple.cpp
-   eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
-   eastern_kingdoms/sunwell_plateau/boss_muru.cpp
-   eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
-   eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
-   eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
-   eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
-   eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
-   eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
-   eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
-   eastern_kingdoms/uldaman/boss_archaedas.cpp
-   eastern_kingdoms/uldaman/instance_uldaman.cpp
-   eastern_kingdoms/uldaman/boss_ironaya.cpp
-   eastern_kingdoms/uldaman/uldaman.cpp
-   eastern_kingdoms/zulaman/boss_akilzon.cpp
-   eastern_kingdoms/zulaman/boss_halazzi.cpp
-   eastern_kingdoms/zulaman/boss_hexlord.cpp
-   eastern_kingdoms/zulaman/boss_janalai.cpp
-   eastern_kingdoms/zulaman/boss_nalorakk.cpp
-   eastern_kingdoms/zulaman/boss_zuljin.cpp
-   eastern_kingdoms/zulaman/zulaman.h
-   eastern_kingdoms/zulaman/instance_zulaman.cpp
-   eastern_kingdoms/zulaman/zulaman.cpp
-   eastern_kingdoms/zulgurub/boss_arlokk.cpp
-   eastern_kingdoms/zulgurub/boss_gahzranka.cpp
-   eastern_kingdoms/zulgurub/boss_grilek.cpp
-   eastern_kingdoms/zulgurub/boss_hakkar.cpp
-   eastern_kingdoms/zulgurub/boss_hazzarah.cpp
-   eastern_kingdoms/zulgurub/boss_jeklik.cpp
-   eastern_kingdoms/zulgurub/boss_jindo.cpp
-   eastern_kingdoms/zulgurub/boss_mandokir.cpp
-   eastern_kingdoms/zulgurub/boss_marli.cpp
-   eastern_kingdoms/zulgurub/boss_renataki.cpp
-   eastern_kingdoms/zulgurub/boss_thekal.cpp
-   eastern_kingdoms/zulgurub/boss_venoxis.cpp
-   eastern_kingdoms/zulgurub/boss_wushoolay.cpp
-   eastern_kingdoms/zulgurub/zulgurub.h
-   eastern_kingdoms/zulgurub/instance_zulgurub.cpp
-   eastern_kingdoms/alterac_mountains.cpp
-   eastern_kingdoms/arathi_highlands.cpp
-   eastern_kingdoms/blasted_lands.cpp
-   eastern_kingdoms/boss_kruul.cpp
-   eastern_kingdoms/burning_steppes.cpp
-   eastern_kingdoms/dun_morogh.cpp
-   eastern_kingdoms/duskwood.cpp
-   eastern_kingdoms/eastern_plaguelands.cpp
-   eastern_kingdoms/elwynn_forest.cpp
-   eastern_kingdoms/eversong_woods.cpp
-   eastern_kingdoms/ghostlands.cpp
-   eastern_kingdoms/hinterlands.cpp
-   eastern_kingdoms/ironforge.cpp
-   eastern_kingdoms/isle_of_queldanas.cpp
-   eastern_kingdoms/loch_modan.cpp
-   eastern_kingdoms/redridge_mountains.cpp
-   eastern_kingdoms/searing_gorge.cpp
-   eastern_kingdoms/silvermoon_city.cpp
-   eastern_kingdoms/silverpine_forest.cpp
-   eastern_kingdoms/stormwind_city.cpp
-   eastern_kingdoms/stranglethorn_vale.cpp
-   eastern_kingdoms/tirisfal_glades.cpp
-   eastern_kingdoms/undercity.cpp
-   eastern_kingdoms/western_plaguelands.cpp
-   eastern_kingdoms/westfall.cpp
-   eastern_kingdoms/wetlands.cpp
-   examples/example_creature.cpp
-   examples/example_escort.cpp
-   examples/example_gossip_codebox.cpp
-   examples/example_misc.cpp
-   kalimdor/blackfathom_depths/boss_gelihast.cpp
-   kalimdor/blackfathom_depths/boss_kelris.cpp
-   kalimdor/blackfathom_depths/boss_aku_mai.cpp
-   kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
-   kalimdor/blackfathom_depths/blackfathom_deeps.cpp
-   kalimdor/blackfathom_depths/blackfathom_deeps.h
-   kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
-   kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
-   kalimdor/caverns_of_time/dark_portal/dark_portal.h
-   kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
-   kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
-   kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
-   kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
-   kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
-   kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
-   kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
-   kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
-   kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
-   kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
-   kalimdor/caverns_of_time/hyjal/hyjal.h
-   kalimdor/caverns_of_time/hyjal/hyjal.cpp
-   kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
-   kalimdor/caverns_of_time/hyjal/hyjal_trash.h
-   kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
-   kalimdor/caverns_of_time/hyjal/hyjalAI.h
-   kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
-   kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
-   kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
-   kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
-   kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
-   kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
-   kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
-   kalimdor/maraudon/boss_celebras_the_cursed.cpp
-   kalimdor/maraudon/boss_landslide.cpp
-   kalimdor/maraudon/boss_noxxion.cpp
-   kalimdor/maraudon/boss_princess_theradras.cpp
-   kalimdor/onyxias_lair/boss_onyxia.cpp
-   kalimdor/onyxias_lair/instance_onyxias_lair.cpp
-   kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
-   kalimdor/razorfen_downs/razorfen_downs.cpp
-   kalimdor/razorfen_downs/instance_razorfen_downs.cpp
-   kalimdor/razorfen_downs/razorfen_downs.h
-   kalimdor/razorfen_kraul/razorfen_kraul.h
-   kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
-   kalimdor/razorfen_kraul/razorfen_kraul.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
-   kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
-   kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
-   kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
-   kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
-   kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
-   kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
-   kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
-   kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
-   kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
-   kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
-   kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
-   kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
-   kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
-   kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
-   kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
-   kalimdor/wailing_caverns/wailing_caverns.h
-   kalimdor/wailing_caverns/instance_wailing_caverns.cpp
-   kalimdor/wailing_caverns/wailing_caverns.cpp
-   kalimdor/zulfarrak/zulfarrak.cpp
-   kalimdor/zulfarrak/instance_zulfarrak.cpp
-   kalimdor/ashenvale.cpp
-   kalimdor/azshara.cpp
-   kalimdor/azuremyst_isle.cpp
-   kalimdor/bloodmyst_isle.cpp
-   kalimdor/boss_azuregos.cpp
-   kalimdor/darkshore.cpp
-   kalimdor/desolace.cpp
-   kalimdor/durotar.cpp
-   kalimdor/dustwallow_marsh.cpp
-   kalimdor/felwood.cpp
-   kalimdor/feralas.cpp
-   kalimdor/moonglade.cpp
-   kalimdor/mulgore.cpp
-   kalimdor/orgrimmar.cpp
-   kalimdor/silithus.cpp
-   kalimdor/stonetalon_mountains.cpp
-   kalimdor/tanaris.cpp
-   kalimdor/teldrassil.cpp
-   kalimdor/the_barrens.cpp
-   kalimdor/thousand_needles.cpp
-   kalimdor/thunder_bluff.cpp
-   kalimdor/ungoro_crater.cpp
-   kalimdor/winterspring.cpp
-   northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
-   northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
-   northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
-   northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
-   northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
-   northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
-   northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
-   northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
-   northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-   northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
-   northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
-   northrend/azjol_nerub/ahnkahet/ahnkahet.h
-   northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
-   northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
-   northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
-   northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
-   northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
-   northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
-   northrend/draktharon_keep/instance_drak_tharon_keep.cpp
-   northrend/draktharon_keep/boss_trollgore.cpp
-   northrend/draktharon_keep/boss_novos.cpp
-   northrend/draktharon_keep/boss_dred.cpp
-   northrend/draktharon_keep/boss_tharon_ja.cpp
-   northrend/draktharon_keep/drak_tharon_keep.h
-   northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
-   northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
-   northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
-   northrend/frozen_halls/forge_of_souls/forge_of_souls.h
-   northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
-   northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
-   northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
-   northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
-   northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
-   northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
-   northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
-   northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
-   northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
-   northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
-   northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
-   northrend/frozen_halls/pit_of_saron/pit_of_saron.h
-   northrend/gundrak/instance_gundrak.cpp
-   northrend/gundrak/boss_slad_ran.cpp
-   northrend/gundrak/boss_moorabi.cpp
-   northrend/gundrak/boss_drakkari_colossus.cpp
-   northrend/gundrak/boss_gal_darah.cpp
-   northrend/gundrak/boss_eck.cpp
-   northrend/gundrak/gundrak.h
-   northrend/naxxramas/boss_anubrekhan.cpp
-   northrend/naxxramas/boss_faerlina.cpp
-   northrend/naxxramas/boss_gluth.cpp
-   northrend/naxxramas/boss_gothik.cpp
-   northrend/naxxramas/boss_grobbulus.cpp
-   northrend/naxxramas/boss_heigan.cpp
-   northrend/naxxramas/boss_kelthuzad.cpp
-   northrend/naxxramas/boss_four_horsemen.cpp
-   northrend/naxxramas/boss_loatheb.cpp
-   northrend/naxxramas/boss_maexxna.cpp
-   northrend/naxxramas/boss_noth.cpp
-   northrend/naxxramas/boss_patchwerk.cpp
-   northrend/naxxramas/boss_razuvious.cpp
-   northrend/naxxramas/boss_sapphiron.cpp
-   northrend/naxxramas/boss_thaddius.cpp
-   northrend/naxxramas/naxxramas.h
-   northrend/naxxramas/instance_naxxramas.cpp
-   northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
-   northrend/nexus/eye_of_eternity/boss_malygos.cpp
-   northrend/nexus/eye_of_eternity/eye_of_eternity.h
-   northrend/nexus/nexus/instance_nexus.cpp
-   northrend/nexus/nexus/boss_magus_telestra.cpp
-   northrend/nexus/nexus/boss_anomalus.cpp
-   northrend/nexus/nexus/boss_ormorok.cpp
-   northrend/nexus/nexus/boss_keristrasza.cpp
-   northrend/nexus/nexus/commander_stoutbeard.cpp
-   northrend/nexus/nexus/commander_kolurg.cpp
-   northrend/nexus/nexus/nexus.h
-   northrend/nexus/oculus/instance_oculus.cpp
-   northrend/nexus/oculus/boss_drakos.cpp
-   northrend/nexus/oculus/boss_urom.cpp
-   northrend/nexus/oculus/boss_varos.cpp
-   northrend/nexus/oculus/boss_eregos.cpp
-   northrend/nexus/oculus/oculus.h
-   northrend/nexus/oculus/oculus.cpp
-   northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
-   northrend/obsidian_sanctum/boss_sartharion.cpp
-   northrend/obsidian_sanctum/obsidian_sanctum.h
-   northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
-   northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
-   northrend/ulduar/halls_of_stone/boss_krystallus.cpp
-   northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
-   northrend/ulduar/halls_of_stone/halls_of_stone.h
-   northrend/ulduar/halls_of_stone/halls_of_stone.cpp
-   northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
-   northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
-   northrend/ulduar/halls_of_lightning/boss_ionar.cpp
-   northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
-   northrend/ulduar/halls_of_lightning/boss_loken.cpp
-   northrend/ulduar/halls_of_lightning/halls_of_lightning.h
-   northrend/ulduar/ulduar/boss_algalon.cpp
-   northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
-   northrend/ulduar/ulduar/boss_auriaya.cpp
-   northrend/ulduar/ulduar/boss_flame_leviathan.cpp
-   northrend/ulduar/ulduar/boss_freya.cpp
-   northrend/ulduar/ulduar/boss_general_vezax.cpp
-   northrend/ulduar/ulduar/boss_hodir.cpp
-   northrend/ulduar/ulduar/boss_ignis.cpp
-   northrend/ulduar/ulduar/boss_kologarn.cpp
-   northrend/ulduar/ulduar/boss_mimiron.cpp
-   northrend/ulduar/ulduar/boss_razorscale.cpp
-   northrend/ulduar/ulduar/boss_thorim.cpp
-   northrend/ulduar/ulduar/boss_xt002.cpp
-   northrend/ulduar/ulduar/boss_yoggsaron.cpp
-   northrend/ulduar/ulduar/ulduar_teleporter.cpp
-   northrend/ulduar/ulduar/ulduar.h
-   northrend/ulduar/ulduar/instance_ulduar.cpp
-   northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
-   northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
-   northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
-   northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
-   northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
-   northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
-   northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
-   northrend/vault_of_archavon/instance_vault_of_archavon.cpp
-   northrend/vault_of_archavon/boss_archavon.cpp
-   northrend/vault_of_archavon/boss_emalon.cpp
-   northrend/vault_of_archavon/boss_koralon.cpp
-   northrend/vault_of_archavon/boss_toravon.cpp
-   northrend/vault_of_archavon/vault_of_archavon.h
-   northrend/violet_hold/instance_violet_hold.cpp
-   northrend/violet_hold/boss_cyanigosa.cpp
-   northrend/violet_hold/boss_erekem.cpp
-   northrend/violet_hold/boss_ichoron.cpp
-   northrend/violet_hold/boss_lavanthor.cpp
-   northrend/violet_hold/boss_moragg.cpp
-   northrend/violet_hold/boss_xevozz.cpp
-   northrend/violet_hold/boss_zuramat.cpp
-   northrend/violet_hold/violet_hold.h
-   northrend/violet_hold/violet_hold.cpp
-   northrend/dalaran.cpp
-   northrend/borean_tundra.cpp
-   northrend/dragonblight.cpp
-   northrend/grizzly_hills.cpp
-   northrend/howling_fjord.cpp
-   northrend/icecrown.cpp
-   northrend/sholazar_basin.cpp
-   northrend/storm_peaks.cpp
-   northrend/zuldrak.cpp
-   northrend/crystalsong_forest.cpp
-   outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
-   outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
-   outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
-   outland/auchindoun/mana_tombs/boss_pandemonius.cpp
-   outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
-   outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
-   outland/auchindoun/sethekk_halls/sethekk_halls.h
-   outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
-   outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
-   outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
-   outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
-   outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
-   outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
-   outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
-   outland/black_temple/black_temple.cpp
-   outland/black_temple/boss_bloodboil.cpp
-   outland/black_temple/boss_illidan.cpp
-   outland/black_temple/boss_mother_shahraz.cpp
-   outland/black_temple/boss_reliquary_of_souls.cpp
-   outland/black_temple/boss_shade_of_akama.cpp
-   outland/black_temple/boss_supremus.cpp
-   outland/black_temple/boss_teron_gorefiend.cpp
-   outland/black_temple/boss_warlord_najentus.cpp
-   outland/black_temple/black_temple.h
-   outland/black_temple/illidari_council.cpp
-   outland/black_temple/instance_black_temple.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
-   outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
-   outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
-   outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
-   outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
-   outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
-   outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
-   outland/coilfang_resevoir/steam_vault/steam_vault.h
-   outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
-   outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
-   outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
-   outland/gruuls_lair/boss_gruul.cpp
-   outland/gruuls_lair/boss_high_king_maulgar.cpp
-   outland/gruuls_lair/gruuls_lair.h
-   outland/gruuls_lair/instance_gruuls_lair.cpp
-   outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
-   outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
-   outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
-   outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
-   outland/hellfire_citadel/blood_furnace/blood_furnace.h
-   outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
-   outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
-   outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
-   outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
-   outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
-   outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
-   outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
-   outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
-   outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
-   outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
-   outland/hellfire_citadel/shattered_halls/shattered_halls.h
-   outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
-   outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
-   outland/tempest_keep/arcatraz/arcatraz.cpp
-   outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
-   outland/tempest_keep/arcatraz/arcatraz.h
-   outland/tempest_keep/arcatraz/instance_arcatraz.cpp
-   outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
-   outland/tempest_keep/botanica/boss_laj.cpp
-   outland/tempest_keep/botanica/boss_warp_splinter.cpp
-   outland/tempest_keep/the_eye/boss_alar.cpp
-   outland/tempest_keep/the_eye/boss_astromancer.cpp
-   outland/tempest_keep/the_eye/boss_kaelthas.cpp
-   outland/tempest_keep/the_eye/boss_void_reaver.cpp
-   outland/tempest_keep/the_eye/the_eye.h
-   outland/tempest_keep/the_eye/instance_the_eye.cpp
-   outland/tempest_keep/the_eye/the_eye.cpp
-   outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
-   outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
-   outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
-   outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
-   outland/tempest_keep/the_mechanar/mechanar.h
-   outland/tempest_keep/the_mechanar/instance_mechanar.cpp
-   outland/blades_edge_mountains.cpp
-   outland/boss_doomlord_kazzak.cpp
-   outland/boss_doomwalker.cpp
-   outland/hellfire_peninsula.cpp
-   outland/nagrand.cpp
-   outland/netherstorm.cpp
-   outland/shadowmoon_valley.cpp
-   outland/shattrath_city.cpp
-   outland/terokkar_forest.cpp
-   outland/zangarmarsh.cpp
-   world/areatrigger_scripts.cpp
-   world/boss_emeriss.cpp
-   world/boss_lethon.cpp
-   world/boss_taerar.cpp
-   world/boss_ysondre.cpp
-   world/go_scripts.cpp
-   world/guards.cpp
-   world/item_scripts.cpp
-   world/mob_generic_creature.cpp
-   world/npc_innkeeper.cpp
-   world/npc_professions.cpp
-   world/npcs_special.cpp
-   world/npc_taxi.cpp
+   Custom/on_events.cpp
+   EasternKingdoms/alterac_valley/alterac_valley.cpp
+   EasternKingdoms/alterac_valley/boss_balinda.cpp
+   EasternKingdoms/alterac_valley/boss_drekthar.cpp
+   EasternKingdoms/alterac_valley/boss_galvangar.cpp
+   EasternKingdoms/alterac_valley/boss_vanndar.cpp
+   EasternKingdoms/blackrock_depths/blackrock_depths.cpp
+   EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
+   EasternKingdoms/blackrock_depths/boss_anubshiah.cpp
+   EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+   EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp
+   EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
+   EasternKingdoms/blackrock_depths/boss_grizzle.cpp
+   EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+   EasternKingdoms/blackrock_depths/boss_magmus.cpp
+   EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
+   EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp
+   EasternKingdoms/blackrock_depths/blackrock_depths.h
+   EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp
+   EasternKingdoms/blackrock_spire/blackrock_spire.cpp
+   EasternKingdoms/blackrock_spire/boss_drakkisath.cpp
+   EasternKingdoms/blackrock_spire/boss_gyth.cpp
+   EasternKingdoms/blackrock_spire/boss_halycon.cpp
+   EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp
+   EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp
+   EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
+   EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
+   EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
+   EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp
+   EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
+   EasternKingdoms/blackrock_spire/boss_the_beast.cpp
+   EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp
+   EasternKingdoms/blackrock_spire/blackrock_spire.h
+   EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp
+   EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
+   EasternKingdoms/blackwing_lair/boss_chromaggus.cpp
+   EasternKingdoms/blackwing_lair/boss_ebonroc.cpp
+   EasternKingdoms/blackwing_lair/boss_firemaw.cpp
+   EasternKingdoms/blackwing_lair/boss_flamegor.cpp
+   EasternKingdoms/blackwing_lair/boss_nefarian.cpp
+   EasternKingdoms/blackwing_lair/boss_razorgore.cpp
+   EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp
+   EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp
+   EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp
+   EasternKingdoms/deadmines/boss_mr_smite.cpp
+   EasternKingdoms/deadmines/deadmines.h
+   EasternKingdoms/deadmines/deadmines.cpp
+   EasternKingdoms/deadmines/instance_deadmines.cpp
+   EasternKingdoms/gnomeregan/gnomeregan.h
+   EasternKingdoms/gnomeregan/gnomeregan.cpp
+   EasternKingdoms/gnomeregan/instance_gnomeregan.cpp
+   EasternKingdoms/karazhan/boss_curator.cpp
+   EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp
+   EasternKingdoms/karazhan/boss_midnight.cpp
+   EasternKingdoms/karazhan/boss_moroes.cpp
+   EasternKingdoms/karazhan/boss_netherspite.cpp
+   EasternKingdoms/karazhan/boss_nightbane.cpp
+   EasternKingdoms/karazhan/boss_prince_malchezaar.cpp
+   EasternKingdoms/karazhan/boss_shade_of_aran.cpp
+   EasternKingdoms/karazhan/boss_terestian_illhoof.cpp
+   EasternKingdoms/karazhan/bosses_opera.cpp
+   EasternKingdoms/karazhan/karazhan.h
+   EasternKingdoms/karazhan/instance_karazhan.cpp
+   EasternKingdoms/karazhan/karazhan.cpp
+   EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
+   EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp
+   EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp
+   EasternKingdoms/magisters_terrace/boss_vexallus.cpp
+   EasternKingdoms/magisters_terrace/magisters_terrace.h
+   EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp
+   EasternKingdoms/magisters_terrace/magisters_terrace.cpp
+   EasternKingdoms/molten_core/boss_baron_geddon.cpp
+   EasternKingdoms/molten_core/boss_garr.cpp
+   EasternKingdoms/molten_core/boss_gehennas.cpp
+   EasternKingdoms/molten_core/boss_golemagg.cpp
+   EasternKingdoms/molten_core/boss_lucifron.cpp
+   EasternKingdoms/molten_core/boss_magmadar.cpp
+   EasternKingdoms/molten_core/boss_majordomo_executus.cpp
+   EasternKingdoms/molten_core/boss_ragnaros.cpp
+   EasternKingdoms/molten_core/boss_shazzrah.cpp
+   EasternKingdoms/molten_core/boss_sulfuron_harbinger.cpp
+   EasternKingdoms/molten_core/molten_core.h
+   EasternKingdoms/molten_core/instance_molten_core.cpp
+   EasternKingdoms/molten_core/molten_core.cpp
+   EasternKingdoms/scarlet_enclave/the_scarlet_enclave.cpp
+   EasternKingdoms/scarlet_enclave/chapter1.cpp
+   EasternKingdoms/scarlet_enclave/chapter2.cpp
+   EasternKingdoms/scarlet_enclave/chapter5.cpp
+   EasternKingdoms/scarlet_monastery/boss_arcanist_doan.cpp
+   EasternKingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
+   EasternKingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
+   EasternKingdoms/scarlet_monastery/boss_herod.cpp
+   EasternKingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
+   EasternKingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
+   EasternKingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
+   EasternKingdoms/scarlet_monastery/boss_scorn.cpp
+   EasternKingdoms/scarlet_monastery/boss_headless_horseman.cpp
+   EasternKingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
+   EasternKingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
+   EasternKingdoms/scarlet_monastery/scarlet_monastery.h
+   EasternKingdoms/scholomance/boss_darkmaster_gandling.cpp
+   EasternKingdoms/scholomance/boss_death_knight_darkreaver.cpp
+   EasternKingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
+   EasternKingdoms/scholomance/boss_illucia_barov.cpp
+   EasternKingdoms/scholomance/boss_instructor_malicia.cpp
+   EasternKingdoms/scholomance/boss_jandice_barov.cpp
+   EasternKingdoms/scholomance/boss_kormok.cpp
+   EasternKingdoms/scholomance/boss_lord_alexei_barov.cpp
+   EasternKingdoms/scholomance/boss_lorekeeper_polkelt.cpp
+   EasternKingdoms/scholomance/boss_ras_frostwhisper.cpp
+   EasternKingdoms/scholomance/boss_the_ravenian.cpp
+   EasternKingdoms/scholomance/boss_vectus.cpp
+   EasternKingdoms/scholomance/scholomance.h
+   EasternKingdoms/scholomance/instance_scholomance.cpp
+   EasternKingdoms/shadowfang_keep/shadowfang_keep.h
+   EasternKingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
+   EasternKingdoms/shadowfang_keep/shadowfang_keep.cpp
+   EasternKingdoms/stratholme/boss_baron_rivendare.cpp
+   EasternKingdoms/stratholme/boss_baroness_anastari.cpp
+   EasternKingdoms/stratholme/boss_cannon_master_willey.cpp
+   EasternKingdoms/stratholme/boss_dathrohan_balnazzar.cpp
+   EasternKingdoms/stratholme/boss_magistrate_barthilas.cpp
+   EasternKingdoms/stratholme/boss_maleki_the_pallid.cpp
+   EasternKingdoms/stratholme/boss_nerubenkan.cpp
+   EasternKingdoms/stratholme/boss_order_of_silver_hand.cpp
+   EasternKingdoms/stratholme/boss_postmaster_malown.cpp
+   EasternKingdoms/stratholme/boss_ramstein_the_gorger.cpp
+   EasternKingdoms/stratholme/boss_timmy_the_cruel.cpp
+   EasternKingdoms/stratholme/stratholme.h
+   EasternKingdoms/stratholme/instance_stratholme.cpp
+   EasternKingdoms/stratholme/stratholme.cpp
+   EasternKingdoms/sunken_temple/sunken_temple.h
+   EasternKingdoms/sunken_temple/instance_sunken_temple.cpp
+   EasternKingdoms/sunken_temple/sunken_temple.cpp
+   EasternKingdoms/sunwell_plateau/boss_kiljaeden.cpp
+   EasternKingdoms/sunwell_plateau/boss_muru.cpp
+   EasternKingdoms/sunwell_plateau/boss_eredar_twins.cpp
+   EasternKingdoms/sunwell_plateau/boss_felmyst.cpp
+   EasternKingdoms/sunwell_plateau/boss_brutallus.cpp
+   EasternKingdoms/sunwell_plateau/boss_kalecgos.cpp
+   EasternKingdoms/sunwell_plateau/sunwell_plateau.cpp
+   EasternKingdoms/sunwell_plateau/sunwell_plateau.h
+   EasternKingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
+   EasternKingdoms/uldaman/boss_archaedas.cpp
+   EasternKingdoms/uldaman/instance_uldaman.cpp
+   EasternKingdoms/uldaman/boss_ironaya.cpp
+   EasternKingdoms/uldaman/uldaman.cpp
+   EasternKingdoms/zulaman/boss_akilzon.cpp
+   EasternKingdoms/zulaman/boss_halazzi.cpp
+   EasternKingdoms/zulaman/boss_hexlord.cpp
+   EasternKingdoms/zulaman/boss_janalai.cpp
+   EasternKingdoms/zulaman/boss_nalorakk.cpp
+   EasternKingdoms/zulaman/boss_zuljin.cpp
+   EasternKingdoms/zulaman/zulaman.h
+   EasternKingdoms/zulaman/instance_zulaman.cpp
+   EasternKingdoms/zulaman/zulaman.cpp
+   EasternKingdoms/zulgurub/boss_arlokk.cpp
+   EasternKingdoms/zulgurub/boss_gahzranka.cpp
+   EasternKingdoms/zulgurub/boss_grilek.cpp
+   EasternKingdoms/zulgurub/boss_hakkar.cpp
+   EasternKingdoms/zulgurub/boss_hazzarah.cpp
+   EasternKingdoms/zulgurub/boss_jeklik.cpp
+   EasternKingdoms/zulgurub/boss_jindo.cpp
+   EasternKingdoms/zulgurub/boss_mandokir.cpp
+   EasternKingdoms/zulgurub/boss_marli.cpp
+   EasternKingdoms/zulgurub/boss_renataki.cpp
+   EasternKingdoms/zulgurub/boss_thekal.cpp
+   EasternKingdoms/zulgurub/boss_venoxis.cpp
+   EasternKingdoms/zulgurub/boss_wushoolay.cpp
+   EasternKingdoms/zulgurub/zulgurub.h
+   EasternKingdoms/zulgurub/instance_zulgurub.cpp
+   EasternKingdoms/alterac_mountains.cpp
+   EasternKingdoms/arathi_highlands.cpp
+   EasternKingdoms/blasted_lands.cpp
+   EasternKingdoms/boss_kruul.cpp
+   EasternKingdoms/burning_steppes.cpp
+   EasternKingdoms/dun_morogh.cpp
+   EasternKingdoms/duskwood.cpp
+   EasternKingdoms/eastern_plaguelands.cpp
+   EasternKingdoms/elwynn_forest.cpp
+   EasternKingdoms/eversong_woods.cpp
+   EasternKingdoms/ghostlands.cpp
+   EasternKingdoms/hinterlands.cpp
+   EasternKingdoms/ironforge.cpp
+   EasternKingdoms/isle_of_queldanas.cpp
+   EasternKingdoms/loch_modan.cpp
+   EasternKingdoms/redridge_mountains.cpp
+   EasternKingdoms/searing_gorge.cpp
+   EasternKingdoms/silvermoon_city.cpp
+   EasternKingdoms/silverpine_forest.cpp
+   EasternKingdoms/stormwind_city.cpp
+   EasternKingdoms/stranglethorn_vale.cpp
+   EasternKingdoms/tirisfal_glades.cpp
+   EasternKingdoms/undercity.cpp
+   EasternKingdoms/western_plaguelands.cpp
+   EasternKingdoms/westfall.cpp
+   EasternKingdoms/wetlands.cpp
+   Examples/example_creature.cpp
+   Examples/example_escort.cpp
+   Examples/example_gossip_codebox.cpp
+   Examples/example_misc.cpp
+   Kalimdor/blackfathom_depths/boss_gelihast.cpp
+   Kalimdor/blackfathom_depths/boss_kelris.cpp
+   Kalimdor/blackfathom_depths/boss_aku_mai.cpp
+   Kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
+   Kalimdor/blackfathom_depths/blackfathom_deeps.cpp
+   Kalimdor/blackfathom_depths/blackfathom_deeps.h
+   Kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
+   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
+   Kalimdor/caverns_of_time/dark_portal/dark_portal.h
+   Kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
+   Kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
+   Kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
+   Kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+   Kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
+   Kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
+   Kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
+   Kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
+   Kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
+   Kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
+   Kalimdor/caverns_of_time/hyjal/hyjal.h
+   Kalimdor/caverns_of_time/hyjal/hyjal.cpp
+   Kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
+   Kalimdor/caverns_of_time/hyjal/hyjal_trash.h
+   Kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
+   Kalimdor/caverns_of_time/hyjal/hyjalAI.h
+   Kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
+   Kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
+   Kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
+   Kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
+   Kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+   Kalimdor/maraudon/boss_celebras_the_cursed.cpp
+   Kalimdor/maraudon/boss_landslide.cpp
+   Kalimdor/maraudon/boss_noxxion.cpp
+   Kalimdor/maraudon/boss_princess_theradras.cpp
+   Kalimdor/onyxias_lair/boss_onyxia.cpp
+   Kalimdor/onyxias_lair/instance_onyxias_lair.cpp
+   Kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
+   Kalimdor/razorfen_downs/razorfen_downs.cpp
+   Kalimdor/razorfen_downs/instance_razorfen_downs.cpp
+   Kalimdor/razorfen_downs/razorfen_downs.h
+   Kalimdor/razorfen_kraul/razorfen_kraul.h
+   Kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
+   Kalimdor/razorfen_kraul/razorfen_kraul.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
+   Kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
+   Kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
+   Kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+   Kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
+   Kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
+   Kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
+   Kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+   Kalimdor/wailing_caverns/wailing_caverns.h
+   Kalimdor/wailing_caverns/instance_wailing_caverns.cpp
+   Kalimdor/wailing_caverns/wailing_caverns.cpp
+   Kalimdor/zulfarrak/zulfarrak.cpp
+   Kalimdor/zulfarrak/instance_zulfarrak.cpp
+   Kalimdor/ashenvale.cpp
+   Kalimdor/azshara.cpp
+   Kalimdor/azuremyst_isle.cpp
+   Kalimdor/bloodmyst_isle.cpp
+   Kalimdor/boss_azuregos.cpp
+   Kalimdor/darkshore.cpp
+   Kalimdor/desolace.cpp
+   Kalimdor/durotar.cpp
+   Kalimdor/dustwallow_marsh.cpp
+   Kalimdor/felwood.cpp
+   Kalimdor/feralas.cpp
+   Kalimdor/moonglade.cpp
+   Kalimdor/mulgore.cpp
+   Kalimdor/orgrimmar.cpp
+   Kalimdor/silithus.cpp
+   Kalimdor/stonetalon_mountains.cpp
+   Kalimdor/tanaris.cpp
+   Kalimdor/teldrassil.cpp
+   Kalimdor/the_barrens.cpp
+   Kalimdor/thousand_needles.cpp
+   Kalimdor/thunder_bluff.cpp
+   Kalimdor/ungoro_crater.cpp
+   Kalimdor/winterspring.cpp
+   Northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+   Northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+   Northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
+   Northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+   Northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
+   Northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+   Northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+   Northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+   Northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+   Northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+   Northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
+   Northrend/azjol_nerub/ahnkahet/ahnkahet.h
+   Northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
+   Northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
+   Northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
+   Northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
+   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
+   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
+   Northrend/draktharon_keep/instance_drak_tharon_keep.cpp
+   Northrend/draktharon_keep/boss_trollgore.cpp
+   Northrend/draktharon_keep/boss_novos.cpp
+   Northrend/draktharon_keep/boss_dred.cpp
+   Northrend/draktharon_keep/boss_tharon_ja.cpp
+   Northrend/draktharon_keep/drak_tharon_keep.h
+   Northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
+   Northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
+   Northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
+   Northrend/frozen_halls/forge_of_souls/forge_of_souls.h
+   Northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
+   Northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
+   Northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
+   Northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
+   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
+   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
+   Northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
+   Northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
+   Northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
+   Northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
+   Northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
+   Northrend/frozen_halls/pit_of_saron/pit_of_saron.h
+   Northrend/gundrak/instance_gundrak.cpp
+   Northrend/gundrak/boss_slad_ran.cpp
+   Northrend/gundrak/boss_moorabi.cpp
+   Northrend/gundrak/boss_drakkari_colossus.cpp
+   Northrend/gundrak/boss_gal_darah.cpp
+   Northrend/gundrak/boss_eck.cpp
+   Northrend/gundrak/gundrak.h
+   Northrend/naxxramas/boss_anubrekhan.cpp
+   Northrend/naxxramas/boss_faerlina.cpp
+   Northrend/naxxramas/boss_gluth.cpp
+   Northrend/naxxramas/boss_gothik.cpp
+   Northrend/naxxramas/boss_grobbulus.cpp
+   Northrend/naxxramas/boss_heigan.cpp
+   Northrend/naxxramas/boss_kelthuzad.cpp
+   Northrend/naxxramas/boss_four_horsemen.cpp
+   Northrend/naxxramas/boss_loatheb.cpp
+   Northrend/naxxramas/boss_maexxna.cpp
+   Northrend/naxxramas/boss_noth.cpp
+   Northrend/naxxramas/boss_patchwerk.cpp
+   Northrend/naxxramas/boss_razuvious.cpp
+   Northrend/naxxramas/boss_sapphiron.cpp
+   Northrend/naxxramas/boss_thaddius.cpp
+   Northrend/naxxramas/naxxramas.h
+   Northrend/naxxramas/instance_naxxramas.cpp
+   Northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
+   Northrend/nexus/eye_of_eternity/boss_malygos.cpp
+   Northrend/nexus/eye_of_eternity/eye_of_eternity.h
+   Northrend/nexus/nexus/instance_nexus.cpp
+   Northrend/nexus/nexus/boss_magus_telestra.cpp
+   Northrend/nexus/nexus/boss_anomalus.cpp
+   Northrend/nexus/nexus/boss_ormorok.cpp
+   Northrend/nexus/nexus/boss_keristrasza.cpp
+   Northrend/nexus/nexus/commander_stoutbeard.cpp
+   Northrend/nexus/nexus/commander_kolurg.cpp
+   Northrend/nexus/nexus/nexus.h
+   Northrend/nexus/oculus/instance_oculus.cpp
+   Northrend/nexus/oculus/boss_drakos.cpp
+   Northrend/nexus/oculus/boss_urom.cpp
+   Northrend/nexus/oculus/boss_varos.cpp
+   Northrend/nexus/oculus/boss_eregos.cpp
+   Northrend/nexus/oculus/oculus.h
+   Northrend/nexus/oculus/oculus.cpp
+   Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
+   Northrend/obsidian_sanctum/boss_sartharion.cpp
+   Northrend/obsidian_sanctum/obsidian_sanctum.h
+   Northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+   Northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
+   Northrend/ulduar/halls_of_stone/boss_krystallus.cpp
+   Northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
+   Northrend/ulduar/halls_of_stone/halls_of_stone.h
+   Northrend/ulduar/halls_of_stone/halls_of_stone.cpp
+   Northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
+   Northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
+   Northrend/ulduar/halls_of_lightning/boss_ionar.cpp
+   Northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
+   Northrend/ulduar/halls_of_lightning/boss_loken.cpp
+   Northrend/ulduar/halls_of_lightning/halls_of_lightning.h
+   Northrend/ulduar/ulduar/boss_algalon.cpp
+   Northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
+   Northrend/ulduar/ulduar/boss_auriaya.cpp
+   Northrend/ulduar/ulduar/boss_flame_leviathan.cpp
+   Northrend/ulduar/ulduar/boss_freya.cpp
+   Northrend/ulduar/ulduar/boss_general_vezax.cpp
+   Northrend/ulduar/ulduar/boss_hodir.cpp
+   Northrend/ulduar/ulduar/boss_ignis.cpp
+   Northrend/ulduar/ulduar/boss_kologarn.cpp
+   Northrend/ulduar/ulduar/boss_mimiron.cpp
+   Northrend/ulduar/ulduar/boss_razorscale.cpp
+   Northrend/ulduar/ulduar/boss_thorim.cpp
+   Northrend/ulduar/ulduar/boss_xt002.cpp
+   Northrend/ulduar/ulduar/boss_yoggsaron.cpp
+   Northrend/ulduar/ulduar/ulduar_teleporter.cpp
+   Northrend/ulduar/ulduar/ulduar.h
+   Northrend/ulduar/ulduar/instance_ulduar.cpp
+   Northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+   Northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+   Northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+   Northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+   Northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
+   Northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
+   Northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
+   Northrend/vault_of_archavon/instance_vault_of_archavon.cpp
+   Northrend/vault_of_archavon/boss_archavon.cpp
+   Northrend/vault_of_archavon/boss_emalon.cpp
+   Northrend/vault_of_archavon/boss_koralon.cpp
+   Northrend/vault_of_archavon/boss_toravon.cpp
+   Northrend/vault_of_archavon/vault_of_archavon.h
+   Northrend/violet_hold/instance_violet_hold.cpp
+   Northrend/violet_hold/boss_cyanigosa.cpp
+   Northrend/violet_hold/boss_erekem.cpp
+   Northrend/violet_hold/boss_ichoron.cpp
+   Northrend/violet_hold/boss_lavanthor.cpp
+   Northrend/violet_hold/boss_moragg.cpp
+   Northrend/violet_hold/boss_xevozz.cpp
+   Northrend/violet_hold/boss_zuramat.cpp
+   Northrend/violet_hold/violet_hold.h
+   Northrend/violet_hold/violet_hold.cpp
+   Northrend/dalaran.cpp
+   Northrend/borean_tundra.cpp
+   Northrend/dragonblight.cpp
+   Northrend/grizzly_hills.cpp
+   Northrend/howling_fjord.cpp
+   Northrend/icecrown.cpp
+   Northrend/sholazar_basin.cpp
+   Northrend/storm_peaks.cpp
+   Northrend/zuldrak.cpp
+   Northrend/crystalsong_forest.cpp
+   Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+   Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+   Outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+   Outland/auchindoun/mana_tombs/boss_pandemonius.cpp
+   Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+   Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+   Outland/auchindoun/sethekk_halls/sethekk_halls.h
+   Outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
+   Outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+   Outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+   Outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+   Outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
+   Outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
+   Outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+   Outland/black_temple/black_temple.cpp
+   Outland/black_temple/boss_bloodboil.cpp
+   Outland/black_temple/boss_illidan.cpp
+   Outland/black_temple/boss_mother_shahraz.cpp
+   Outland/black_temple/boss_reliquary_of_souls.cpp
+   Outland/black_temple/boss_shade_of_akama.cpp
+   Outland/black_temple/boss_supremus.cpp
+   Outland/black_temple/boss_teron_gorefiend.cpp
+   Outland/black_temple/boss_warlord_najentus.cpp
+   Outland/black_temple/black_temple.h
+   Outland/black_temple/illidari_council.cpp
+   Outland/black_temple/instance_black_temple.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+   Outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+   Outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
+   Outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+   Outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
+   Outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
+   Outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
+   Outland/coilfang_resevoir/steam_vault/steam_vault.h
+   Outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+   Outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
+   Outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
+   Outland/gruuls_lair/boss_gruul.cpp
+   Outland/gruuls_lair/boss_high_king_maulgar.cpp
+   Outland/gruuls_lair/gruuls_lair.h
+   Outland/gruuls_lair/instance_gruuls_lair.cpp
+   Outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
+   Outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+   Outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+   Outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+   Outland/hellfire_citadel/blood_furnace/blood_furnace.h
+   Outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
+   Outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
+   Outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
+   Outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
+   Outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
+   Outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+   Outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
+   Outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+   Outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+   Outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+   Outland/hellfire_citadel/shattered_halls/shattered_halls.h
+   Outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+   Outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+   Outland/tempest_keep/arcatraz/arcatraz.cpp
+   Outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
+   Outland/tempest_keep/arcatraz/arcatraz.h
+   Outland/tempest_keep/arcatraz/instance_arcatraz.cpp
+   Outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
+   Outland/tempest_keep/botanica/boss_laj.cpp
+   Outland/tempest_keep/botanica/boss_warp_splinter.cpp
+   Outland/tempest_keep/the_eye/boss_alar.cpp
+   Outland/tempest_keep/the_eye/boss_astromancer.cpp
+   Outland/tempest_keep/the_eye/boss_kaelthas.cpp
+   Outland/tempest_keep/the_eye/boss_void_reaver.cpp
+   Outland/tempest_keep/the_eye/the_eye.h
+   Outland/tempest_keep/the_eye/instance_the_eye.cpp
+   Outland/tempest_keep/the_eye/the_eye.cpp
+   Outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
+   Outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
+   Outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+   Outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+   Outland/tempest_keep/the_mechanar/mechanar.h
+   Outland/tempest_keep/the_mechanar/instance_mechanar.cpp
+   Outland/blades_edge_mountains.cpp
+   Outland/boss_doomlord_kazzak.cpp
+   Outland/boss_doomwalker.cpp
+   Outland/hellfire_peninsula.cpp
+   Outland/nagrand.cpp
+   Outland/netherstorm.cpp
+   Outland/shadowmoon_valley.cpp
+   Outland/shattrath_city.cpp
+   Outland/terokkar_forest.cpp
+   Outland/zangarmarsh.cpp
+   World/areatrigger_scripts.cpp
+   World/boss_emeriss.cpp
+   World/boss_lethon.cpp
+   World/boss_taerar.cpp
+   World/boss_ysondre.cpp
+   World/go_scripts.cpp
+   World/guards.cpp
+   World/item_scripts.cpp
+   World/mob_generic_creature.cpp
+   World/npc_innkeeper.cpp
+   World/npc_professions.cpp
+   World/npcs_special.cpp
+   World/npc_taxi.cpp
 )
 message("-- Added Script Engine to SCRIPTS lib")
 
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 5e0a2f40adf..a9ecb23e72b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -13,22 +13,22 @@ add_subdirectory(Utilities)
 ########### next target ###############
 
 SET(shared_STAT_SRCS
-   ByteBuffer.h
+   Debugging/Errors.h
+   Logging/Log.cpp
+   Logging/Log.h
+   Packets/ByteBuffer.h
+   Packets/WorldPacket.h
+   Threading/DelayExecutor.cpp
+   Threading/DelayExecutor.h
+   Threading/Threading.cpp
+   Utilities/ProgressBar.cpp
+   Utilities/ProgressBar.h
+   Utilities/SignalHandler.h
+   Utilities/Timer.h
+   Utilities/Util.cpp
+   Utilities/Util.h
    Common.cpp
    Common.h
-   DelayExecutor.cpp
-   DelayExecutor.h
-   Errors.h
-   Log.cpp
-   Log.h
-   ProgressBar.cpp
-   ProgressBar.h
-   SignalHandler.h
-   Threading.cpp
-   Timer.h
-   Util.cpp
-   Util.h
-   WorldPacket.h
    SystemConfig.h
 )
 
diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
index 6e5d10d40e5..cdd9ece3fa0 100644
--- a/src/server/shared/Cryptography/CMakeLists.txt
+++ b/src/server/shared/Cryptography/CMakeLists.txt
@@ -2,25 +2,24 @@
 ########### next target ###############
 
 SET(trinityauth_STAT_SRCS
-   AuthCrypt.cpp
-   AuthCrypt.h
+   Authentication/AuthCrypt.cpp
+   Authentication/AuthCrypt.h
    BigNumber.cpp
    BigNumber.h
-   Hmac.cpp
-   Hmac.h
-   Sha1.cpp
-   Sha1.h
-   md5.c
-   md5.h
-   SARC4.cpp
-   SARC4.h
+   HMACSHA1.cpp
+   HMACSHA1.h
+   SHA1.cpp
+   SHA1.h
+   MD5.c
+   MD5.h
+   ARC4.cpp
+   ARC4.h
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
index e30c8ae3ca2..cfe36b8c7d3 100644
--- a/src/server/shared/Database/CMakeLists.txt
+++ b/src/server/shared/Database/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(trinitydatabase_STAT_SRCS
-    DBCFileLoader.cpp
-    DBCFileLoader.h
-    DBCStore.h
+    ../DataStores/DBCFileLoader.cpp
+    ../DataStores/DBCFileLoader.h
+    ../DataStores/DBCStore.h
     Database.cpp
     Database.h
     DatabaseEnv.h   
@@ -23,7 +23,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${MYSQL_INCLUDE_DIR}
 )
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3adfbf0339f..61f68851408 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -2,15 +2,15 @@
 ########### next target ###############
 
 SET(trinity-core_SRCS
-CliRunnable.cpp
-CliRunnable.h
+CommandLine/CliRunnable.cpp
+CommandLine/CliRunnable.h
+RemoteAccess/RASocket.cpp
+RemoteAccess/RASocket.h
+WorldThread/WorldRunnable.cpp
+WorldThread/WorldRunnable.h
 Main.cpp
 Master.cpp
 Master.h
-RASocket.cpp
-RASocket.h
-WorldRunnable.cpp
-WorldRunnable.h
 )
 
 include_directories(
@@ -19,8 +19,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${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/game
   ${CMAKE_SOURCE_DIR}/src/server/game/Account
   ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
-- 
cgit v1.2.3


From bef0ed9a7ff9cab7acf198558a695bc914c61d13 Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Mon, 7 Jun 2010 12:57:21 +0200
Subject: Fix some paths on shared/ includes and CMakeLists.txt

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt | 11 +++++++++++
 src/server/shared/Common.h       |  4 ++--
 src/server/shared/Define.h       |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index a9ecb23e72b..028c2185b79 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -38,6 +38,17 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/dep/include/sockets
   ${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/Database
+  ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${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
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 4a6aac43390..b4ba254fbeb 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -59,7 +59,7 @@
 #undef VERSION
 #endif //HAVE_CONFIG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 #if COMPILER == COMPILER_MICROSOFT
 #   pragma warning(disable:4996)                            // 'function': was declared deprecated
@@ -76,7 +76,7 @@
 #endif                                                      // __SHOW_STUPID_WARNINGS__
 #endif                                                      // __GNUC__
 
-#include "Utilities/UnorderedMap.h"
+#include "UnorderedMap.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index 9285bf289f9..980cf9023e1 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -26,7 +26,7 @@
 #include <ace/Basic_Types.h>
 #include <ace/ACE_export.h>
 
-#include "Platform/CompilerDefs.h"
+#include "CompilerDefs.h"
 
 #define TRINITY_LITTLEENDIAN 0
 #define TRINITY_BIGENDIAN    1
-- 
cgit v1.2.3


From cbaf5587d62459df3ddd0a4312cb549649c30a4a Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 07:13:35 -0600
Subject: * shared lib builds again under Linux.

--HG--
branch : trunk
---
 dep/include/mersennetwister/MersenneTwister.h | 2 +-
 dep/include/utf8cpp/utf8/core.h               | 2 +-
 src/server/collision/CMakeLists.txt           | 4 ++--
 src/server/shared/Configuration/Config.h      | 2 +-
 src/server/shared/Database/Database.h         | 2 +-
 src/server/shared/Debugging/MemoryLeaks.h     | 2 +-
 src/server/shared/Dynamic/UnorderedMap.h      | 4 ++--
 src/server/shared/Logging/Log.cpp             | 2 +-
 src/server/shared/Policies/CreationPolicy.h   | 2 +-
 src/server/shared/Policies/ObjectLifeTime.h   | 2 +-
 src/server/shared/Policies/ThreadingModel.h   | 2 +-
 src/server/shared/Utilities/ProgressBar.h     | 2 +-
 src/server/shared/Utilities/Timer.h           | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/server/shared')

diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h
index a4a3bbdd415..1cff879643f 100644
--- a/dep/include/mersennetwister/MersenneTwister.h
+++ b/dep/include/mersennetwister/MersenneTwister.h
@@ -60,7 +60,7 @@
 // Not thread safe (unless auto-initialization is avoided and each thread has
 // its own MTRand object)
 
-#include"Platform/Define.h"
+#include"Define.h"
 
 #include <limits.h>
 #include <time.h>
diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/include/utf8cpp/utf8/core.h
index 389dd3e8ca5..3b6edf70b96 100644
--- a/dep/include/utf8cpp/utf8/core.h
+++ b/dep/include/utf8cpp/utf8/core.h
@@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #include <iterator>
 
 // use Trinity core types
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace utf8
 {
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index e30b9a2bf36..e9fa25d8674 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -2,8 +2,8 @@
 ########### next target ###############
 
 SET(collision_STAT_SRCS
-   BIH.h
-   BIH.cpp
+   BoundingIntervalHierarchy.h
+   BoundingIntervalHierarchy.cpp
    Management/IVMapManager.h
    Maps/MapTree.cpp
    Maps/MapTree.h
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index ccc76073e46..bfcb324ee62 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -22,7 +22,7 @@
 #define CONFIG_H
 
 #include <Policies/Singleton.h>
-#include "Platform/Define.h"
+#include "Define.h"
 
 class DOTCONFDocument;
 
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 4ad5d29c993..f99f7c93c8f 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -22,7 +22,7 @@
 #define DATABASE_H
 
 #include "Threading.h"
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
index c8b8fb8e1b1..bc722f241bd 100644
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ b/src/server/shared/Debugging/MemoryLeaks.h
@@ -19,7 +19,7 @@
 #ifndef TRINITYSERVER_MEMORY_H
 #define TRINITYSERVER_MEMORY_H
 
-#include "Platform/CompilerDefs.h"
+#include "shared/CompilerDefs.h"
 
 #if COMPILER == COMPILER_MICROSOFT
 
diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h
index fce5ec82bfc..fa87411258d 100644
--- a/src/server/shared/Dynamic/UnorderedMap.h
+++ b/src/server/shared/Dynamic/UnorderedMap.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_UNORDERED_MAP_H
 #define TRINITY_UNORDERED_MAP_H
 
-#include "Platform/CompilerDefs.h"
-#include "Platform/Define.h"
+#include "CompilerDefs.h"
+#include "Define.h"
 
 #if COMPILER == COMPILER_INTEL
 #include <ext/hash_map>
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 187b9eaa79b..e701e073d5c 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include "Log.h"
 #include "Policies/SingletonImp.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Util.h"
 
 #include <stdarg.h>
diff --git a/src/server/shared/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h
index 8552ce7da52..cc38d704e99 100644
--- a/src/server/shared/Policies/CreationPolicy.h
+++ b/src/server/shared/Policies/CreationPolicy.h
@@ -22,7 +22,7 @@
 #define TRINITY_CREATIONPOLICY_H
 
 #include <stdlib.h>
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace Trinity
 {
diff --git a/src/server/shared/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h
index 61b90b59f6e..205434cb613 100644
--- a/src/server/shared/Policies/ObjectLifeTime.h
+++ b/src/server/shared/Policies/ObjectLifeTime.h
@@ -22,7 +22,7 @@
 #define TRINITY_OBJECTLIFETIME_H
 
 #include <stdexcept>
-#include "Platform/Define.h"
+#include "Define.h"
 
 typedef void (* Destroyer)(void);
 
diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
index d4c5e9a2333..a792bf1b7d7 100644
--- a/src/server/shared/Policies/ThreadingModel.h
+++ b/src/server/shared/Policies/ThreadingModel.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace Trinity
 {
diff --git a/src/server/shared/Utilities/ProgressBar.h b/src/server/shared/Utilities/ProgressBar.h
index e7565590278..cae23254f30 100644
--- a/src/server/shared/Utilities/ProgressBar.h
+++ b/src/server/shared/Utilities/ProgressBar.h
@@ -20,7 +20,7 @@
 #ifndef TRINITYCORE_PROGRESSBAR_H
 #define TRINITYCORE_PROGRESSBAR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 class barGoLink
 {
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index 3e0a369b655..ed78c1d42e7 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_TIMER_H
 #define TRINITY_TIMER_H
 
-#include "Platform/CompilerDefs.h"
+#include "shared/CompilerDefs.h"
 
 #if PLATFORM == PLATFORM_WINDOWS
 #   include <ace/config-all.h>
-- 
cgit v1.2.3


From 36584926e6684c0df19562e3a438f45ff38dee10 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 07:43:20 -0600
Subject: * Auth lib builds again.

--HG--
branch : trunk
---
 src/server/shared/Common.h                                  | 6 +++---
 src/server/shared/Cryptography/ARC4.cpp                     | 2 +-
 src/server/shared/Cryptography/Authentication/AuthCrypt.cpp | 6 +++---
 src/server/shared/Cryptography/Authentication/AuthCrypt.h   | 2 +-
 src/server/shared/Cryptography/BigNumber.cpp                | 2 +-
 src/server/shared/Cryptography/HMACSHA1.cpp                 | 2 +-
 src/server/shared/Cryptography/MD5.c                        | 2 +-
 src/server/shared/Cryptography/SHA1.cpp                     | 4 ++--
 src/server/shared/Database/Database.h                       | 2 +-
 src/server/shared/Database/DatabaseEnv.h                    | 4 ++--
 src/server/shared/Database/SqlDelayThread.h                 | 2 +-
 src/server/shared/Threading/LockedQueue.h                   | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index b4ba254fbeb..0922ac254dc 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -76,7 +76,7 @@
 #endif                                                      // __SHOW_STUPID_WARNINGS__
 #endif                                                      // __GNUC__
 
-#include "UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -100,8 +100,8 @@
 #include <sstream>
 #include <algorithm>
 
-#include "LockedQueue.h"
-#include "Threading.h"
+#include "Threading/LockedQueue.h"
+#include "Threading/Threading.h"
 
 #include <ace/Basic_Types.h>
 #include <ace/Guard_T.h>
diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp
index 80cad4991e9..8427640ba2a 100644
--- a/src/server/shared/Cryptography/ARC4.cpp
+++ b/src/server/shared/Cryptography/ARC4.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Auth/SARC4.h"
+#include "ARC4.h"
 #include <openssl/sha.h>
 
 SARC4::SARC4(uint8 len)
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
index b34b922b16a..2dfcebfa932 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "AuthCrypt.h"
-#include "Hmac.h"
-#include "Log.h"
-#include "BigNumber.h"
+#include "Cryptography/HMACSHA1.h"
+#include "Logging/Log.h"
+#include "Cryptography/BigNumber.h"
 
 AuthCrypt::AuthCrypt() : _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH)
 {
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
index 6695dc580cc..5a2430611a4 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.h
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
@@ -22,7 +22,7 @@
 #define _AUTHCRYPT_H
 
 #include <Common.h>
-#include "SARC4.h"
+#include "Cryptography/ARC4.h"
 
 class BigNumber;
 
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 64e9ef21ccc..c05258c73a0 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/BigNumber.h"
+#include "Cryptography/BigNumber.h"
 #include <openssl/bn.h>
 #include <algorithm>
 
diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp
index a30f1b2d1e2..aed8940372b 100644
--- a/src/server/shared/Cryptography/HMACSHA1.cpp
+++ b/src/server/shared/Cryptography/HMACSHA1.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Hmac.h"
+#include "HMACSHA1.h"
 #include "BigNumber.h"
 
 HmacHash::HmacHash(uint32 len, uint8 *seed)
diff --git a/src/server/shared/Cryptography/MD5.c b/src/server/shared/Cryptography/MD5.c
index 3e9735e2dbb..45897503455 100644
--- a/src/server/shared/Cryptography/MD5.c
+++ b/src/server/shared/Cryptography/MD5.c
@@ -51,7 +51,7 @@ self-checking.
 1999-05-03 lpd Original version.
 */
 
-#include "md5.h"
+#include "MD5.h"
 #include <string.h>
 
 #undef BYTE_ORDER                                           /* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index b63deb2c5f3..b50f72af4d3 100644
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Sha1.h"
-#include "Auth/BigNumber.h"
+#include "SHA1.h"
+#include "BigNumber.h"
 #include <stdarg.h>
 
 Sha1Hash::Sha1Hash()
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index f99f7c93c8f..1a516bdc3d7 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -21,7 +21,7 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include "Threading.h"
+#include "Threading/Threading.h"
 #include "Dynamic/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
 #include "Policies/Singleton.h"
diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h
index 69236b076e9..15c1b1c599e 100644
--- a/src/server/shared/Database/DatabaseEnv.h
+++ b/src/server/shared/Database/DatabaseEnv.h
@@ -22,8 +22,8 @@
 #define DATABASEENV_H
 
 #include "Common.h"
-#include "Log.h"
-#include "Errors.h"
+#include "Logging/Log.h"
+#include "Debugging/Errors.h"
 
 #include "Database/Field.h"
 #include "Database/QueryResult.h"
diff --git a/src/server/shared/Database/SqlDelayThread.h b/src/server/shared/Database/SqlDelayThread.h
index d603813c8fa..4ef9c67aa5b 100644
--- a/src/server/shared/Database/SqlDelayThread.h
+++ b/src/server/shared/Database/SqlDelayThread.h
@@ -23,7 +23,7 @@
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Activation_Queue.h"
-#include "Threading.h"
+#include "Threading/Threading.h"
 
 class Database;
 class SqlOperation;
diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h
index 9f8afae6c14..ff6056350f3 100644
--- a/src/server/shared/Threading/LockedQueue.h
+++ b/src/server/shared/Threading/LockedQueue.h
@@ -23,7 +23,7 @@
 #include <ace/Thread_Mutex.h>
 #include <deque>
 #include <assert.h>
-#include "Errors.h"
+#include "Debugging/Errors.h"
 
 namespace ACE_Based
 {
-- 
cgit v1.2.3


From 12dc250bf06d2eccc0678a5eb2f5a881fec08744 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 07:58:31 -0600
Subject: * Lib trinitydatabase builds again

--HG--
branch : trunk
---
 src/server/shared/DataStores/DBCFileLoader.h |  2 +-
 src/server/shared/Database/Database.cpp      | 12 ++++++------
 src/server/shared/Database/SQLStorageImpl.h  |  6 +++---
 src/server/shared/Database/SqlOperations.h   |  4 ++--
 src/server/shared/Utilities/ByteConverter.h  |  2 +-
 src/server/shared/Utilities/Timer.h          |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index a97ab4d60fa..f59ad038ce0 100644
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -18,7 +18,7 @@
 
 #ifndef DBC_FILE_LOADER_H
 #define DBC_FILE_LOADER_H
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Utilities/ByteConverter.h"
 #include <cassert>
 
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 7646a451eb4..91275716bf8 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -19,18 +19,18 @@
  */
 
 #include "DatabaseEnv.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 
 #include "Common.h"
-#include "UpdateFields.h"
+#include "Updates/UpdateFields.h"
 
-#include "Util.h"
+#include "Utilities/Util.h"
 #include "Policies/SingletonImp.h"
-#include "Platform/Define.h"
-#include "Threading.h"
+#include "Define.h"
+#include "Threading/Threading.h"
 #include "Database/SqlDelayThread.h"
 #include "Database/SqlOperations.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 
 #include <ctime>
diff --git a/src/server/shared/Database/SQLStorageImpl.h b/src/server/shared/Database/SQLStorageImpl.h
index c74be48c34c..b3d06484e2e 100644
--- a/src/server/shared/Database/SQLStorageImpl.h
+++ b/src/server/shared/Database/SQLStorageImpl.h
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ProgressBar.h"
-#include "Log.h"
-#include "DBCFileLoader.h"
+#include "Utilities/ProgressBar.h"
+#include "Logging/Log.h"
+#include "DataStores/DBCFileLoader.h"
 
 template<class T>
 template<class S, class D>
diff --git a/src/server/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h
index f2e09c0c921..eb28a2c0790 100644
--- a/src/server/shared/Database/SqlOperations.h
+++ b/src/server/shared/Database/SqlOperations.h
@@ -25,9 +25,9 @@
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Method_Request.h"
-#include "LockedQueue.h"
+#include "Threading/LockedQueue.h"
 #include <queue>
-#include "Utilities/Callback.h"
+#include "Threading/Callback.h"
 #include "QueryResult.h"
 
 /// ---- BASE ---
diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h
index f8b6bd72498..24a89f464b8 100644
--- a/src/server/shared/Utilities/ByteConverter.h
+++ b/src/server/shared/Utilities/ByteConverter.h
@@ -25,7 +25,7 @@
     for cross platform where they have different endians.
  */
 
-#include<Platform/Define.h>
+#include "Define.h"
 #include<algorithm>
 
 namespace ByteConverter
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index ed78c1d42e7..326df71bf50 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_TIMER_H
 #define TRINITY_TIMER_H
 
-#include "shared/CompilerDefs.h"
+#include "CompilerDefs.h"
 
 #if PLATFORM == PLATFORM_WINDOWS
 #   include <ace/config-all.h>
-- 
cgit v1.2.3


From 2435b4152d056225329772158cc8a9fc7e4b7f11 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 09:04:14 -0600
Subject: * Nope still won't build yet

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStructure.h              |  4 ++--
 src/server/game/Entities/Object/Object.h               |  8 ++++----
 src/server/game/Entities/Object/ObjectDefines.h        |  2 +-
 src/server/game/Entities/Object/Updates/UpdateData.h   |  2 +-
 src/server/game/Entities/Unit/Unit.h                   |  2 +-
 src/server/game/Globals/ObjectAccessor.h               |  8 ++++----
 src/server/game/Grids/Cells/Cell.h                     |  6 +++---
 src/server/game/Grids/Grid.h                           |  6 +++---
 src/server/game/Grids/GridDefines.h                    |  2 +-
 src/server/game/Grids/GridRefManager.h                 |  2 +-
 src/server/game/Grids/GridReference.h                  |  2 +-
 src/server/game/Grids/NGrid.h                          |  8 ++++----
 src/server/game/Maps/Map.h                             | 14 +++++++-------
 src/server/game/Maps/MapManager.h                      |  4 ++--
 src/server/game/Maps/MapRefManager.h                   |  2 +-
 src/server/game/Maps/MapUpdater.h                      |  2 +-
 src/server/game/Miscellaneous/SharedDefines.h          |  2 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.h        |  4 ++--
 src/server/game/Server/Protocol/Opcodes.h              |  2 +-
 src/server/game/Server/WorldSession.h                  |  8 ++++----
 src/server/game/Server/WorldSocket.h                   |  2 +-
 src/server/game/World/World.h                          |  6 +++---
 src/server/shared/Dynamic/LinkedReference/RefManager.h |  4 ++--
 src/server/shared/Dynamic/LinkedReference/Reference.h  |  2 +-
 src/server/shared/Dynamic/TypeContainer.h              |  6 +++---
 src/server/shared/Dynamic/TypeContainerFunctions.h     |  4 ++--
 src/server/shared/Dynamic/TypeContainerVisitor.h       |  4 ++--
 src/server/shared/Packets/ByteBuffer.h                 |  4 ++--
 28 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 0fc0d1251f5..480aceb26e6 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -22,8 +22,8 @@
 #define TRINITY_DBCSTRUCTURE_H
 
 #include "DBCEnums.h"
-#include "Platform/Define.h"
-#include "Util.h"
+#include "Define.h"
+#include "Utilities/Util.h"
 
 #include <map>
 #include <set>
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index c5a412c3ab7..edeac0a20ef 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -22,11 +22,11 @@
 #define _OBJECT_H
 
 #include "Common.h"
-#include "UpdateFields.h"
-#include "UpdateData.h"
-#include "GameSystem/GridReference.h"
+#include "Updates/UpdateFields.h"
+#include "Updates/UpdateData.h"
+#include "Grids/GridReference.h"
 #include "ObjectDefines.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "Map.h"
 
 #include <set>
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index a0e5ac1952d..15ce30d9a81 100644
--- a/src/server/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_OBJECTDEFINES_H
 #define TRINITY_OBJECTDEFINES_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 // used for creating values for respawn for example
 #define MAKE_PAIR64(l, h)  uint64(uint32(l) | (uint64(h) << 32))
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index e560db842f5..eb10696a26e 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -21,7 +21,7 @@
 #ifndef __UPDATEDATA_H
 #define __UPDATEDATA_H
 
-#include "ByteBuffer.h"
+#include "Packets/ByteBuffer.h"
 class WorldPacket;
 
 enum OBJECT_UPDATE_TYPE
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index a2f4b2cd388..c41a00f2e43 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "Object.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "SpellAuraDefines.h"
 #include "UpdateFields.h"
 #include "SharedDefines.h"
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index 8e64eb48fa0..1f865229d42 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -21,15 +21,15 @@
 #ifndef TRINITY_OBJECTACCESSOR_H
 #define TRINITY_OBJECTACCESSOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include <ace/Thread_Mutex.h>
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Policies/ThreadingModel.h"
 
-#include "UpdateData.h"
+#include "Updates/UpdateData.h"
 
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "Object.h"
 #include "Player.h"
 
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 49e0329ace6..657cc403e2a 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -23,10 +23,10 @@
 
 #include <cmath>
 
-#include "GameSystem/TypeContainer.h"
-#include "GameSystem/TypeContainerVisitor.h"
+#include "Dynamic/TypeContainer.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 
 class Map;
 class WorldObject;
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 65bf3c92f9d..0085bc70152 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -32,10 +32,10 @@
   Grid's perspective, the loader meets its API requirement is suffice.
 */
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/ThreadingModel.h"
-#include "TypeContainer.h"
-#include "TypeContainerVisitor.h"
+#include "Dynamic/TypeContainer.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
 // forward declaration
 template<class A, class T, class O> class GridLoader;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 5269d0a094d..e27ebec4a46 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -22,7 +22,7 @@
 #define TRINITY_GRIDDEFINES_H
 
 #include "Common.h"
-#include "GameSystem/NGrid.h"
+#include "Grids/NGrid.h"
 #include <cmath>
 
 // Forward class definitions
diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index 79799105fb7..8f3430a0b4a 100644
--- a/src/server/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFMANAGER
 #define _GRIDREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 template<class OBJECT>
 class GridReference;
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index d2e3a455895..ac7c8e154b2 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFERENCE_H
 #define _GRIDREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 template<class OBJECT>
 class GridRefManager;
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 3810286e123..1d8967e4d9a 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,10 +24,10 @@
 /** NGrid is nothing more than a wrapper of the Grid with an NxN cells
  */
 
-#include "GameSystem/Grid.h"
-#include "GameSystem/GridReference.h"
-#include "Timer.h"
-#include "Util.h"
+#include "Grids/Grid.h"
+#include "Grids/GridReference.h"
+#include "Utilities/Timer.h"
+#include "Utilities/Util.h"
 
 #define DEFAULT_VISIBILITY_NOTIFY_PERIOD      1000
 
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index ceb526b8244..a0e3a2a93f8 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -21,18 +21,18 @@
 #ifndef TRINITY_MAP_H
 #define TRINITY_MAP_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
 
 #include "DBCStructure.h"
-#include "GridDefines.h"
-#include "Cell.h"
-#include "Timer.h"
-#include "SharedDefines.h"
-#include "GameSystem/GridRefManager.h"
-#include "MapRefManager.h"
+#include "Grids/GridDefines.h"
+#include "Grids/Cells/Cell.h"
+#include "Utilities/Timer.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Grids/GridRefManager.h"
+#include "Maps/MapRefManager.h"
 #include "mersennetwister/MersenneTwister.h"
 
 #include <bitset>
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index d94f9fced0e..891e95d75f9 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -21,12 +21,12 @@
 #ifndef TRINITY_MAPMANAGER_H
 #define TRINITY_MAPMANAGER_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
-#include "GridStates.h"
+#include "Grids/GridStates.h"
 #include "MapUpdater.h"
 
 class Transport;
diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index 4337aa75fd9..8712d343958 100644
--- a/src/server/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFMANAGER
 #define _MAPREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class MapReference;
 
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index f301b15ca2f..48cd8db0c36 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -4,7 +4,7 @@
 #include <ace/Thread_Mutex.h>
 #include <ace/Condition_Thread_Mutex.h>
 
-#include "DelayExecutor.h"
+#include "Threading/DelayExecutor.h"
 
 class Map;
 
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 903dd4b09ca..381114c6f38 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_SHAREDDEFINES_H
 #define TRINITY_SHAREDDEFINES_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include <cassert>
 
 // loot modes for creatures and gameobjects, bitmask!
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index 7252e980e7d..cb42e4138e4 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -1,9 +1,9 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 
 #include "MapManager.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "Database/SQLStorage.h"
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 4ae6931c3f5..67f2026f1f5 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -31,7 +31,7 @@
 //       if this class definition not complite then VS for x64 release use different size for
 //       struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
 //       table opcodeTable in source when Opcode.h included but WorldSession.h not included
-#include "WorldSession.h"
+#include "Server/WorldSession.h"
 
 /// List of Opcodes
 enum Opcodes
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index c17f3e3f3e6..d2e8f6cdada 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -26,10 +26,10 @@
 #define __WORLDSESSION_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "AddonMgr.h"
-#include "QueryResult.h"
-#include "World.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Addons/AddonMgr.h"
+#include "Database/QueryResult.h"
+#include "World/World.h"
 
 struct ItemPrototype;
 struct AuctionEntry;
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 70654274215..61158799bec 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -43,7 +43,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Common.h"
-#include "Auth/AuthCrypt.h"
+#include "Cryptography/Authentication/AuthCrypt.h"
 
 class ACE_Message_Block;
 class WorldPacket;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 1a95253fa03..dfd13e60d46 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -26,11 +26,11 @@
 #define __WORLD_H
 
 #include "Common.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 #include "Policies/Singleton.h"
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "ace/Atomic_Op.h"
-#include "QueryResult.h"
+#include "Database/QueryResult.h"
 
 #include <map>
 #include <set>
diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h
index 7e294b4f5f0..ea79d5e1784 100644
--- a/src/server/shared/Dynamic/LinkedReference/RefManager.h
+++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h
@@ -22,8 +22,8 @@
 #define _REFMANAGER_H
 //=====================================================
 
-#include "Utilities/LinkedList.h"
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedList.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 template <class TO, class FROM> class RefManager : public LinkedListHead
 {
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index 4a1545f8f12..8891199a5eb 100644
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -21,7 +21,7 @@
 #ifndef _REFERENCE_H
 #define _REFERENCE_H
 
-#include "Utilities/LinkedList.h"
+#include "Dynamic/LinkedList.h"
 
 //=====================================================
 
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
index c2c9b4fcdea..0fa61f5e562 100644
--- a/src/server/shared/Dynamic/TypeContainer.h
+++ b/src/server/shared/Dynamic/TypeContainer.h
@@ -28,9 +28,9 @@
 
 #include <map>
 #include <vector>
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
-#include "GameSystem/GridRefManager.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
+#include "Grids/GridRefManager.h"
 
 /*
  * @class ContainerMapList is a mulit-type container for map elements
diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
index edfbb40e659..7ab2151461e 100644
--- a/src/server/shared/Dynamic/TypeContainerFunctions.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctions.h
@@ -27,8 +27,8 @@
  * to access or mutate the container.
  */
 
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
 #include <map>
 
 namespace Trinity
diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h
index f15075e5afd..6057eb32fc3 100644
--- a/src/server/shared/Dynamic/TypeContainerVisitor.h
+++ b/src/server/shared/Dynamic/TypeContainerVisitor.h
@@ -27,8 +27,8 @@
  * to overload its types as a visit method is called.
  */
 
-#include "Platform/Define.h"
-#include "TypeContainer.h"
+#include "Define.h"
+#include "Dynamic/TypeContainer.h"
 
 // forward declaration
 template<class T, class Y> class TypeContainerVisitor;
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index ba0240fb58b..98709a5b0e0 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -22,8 +22,8 @@
 #define _BYTEBUFFER_H
 
 #include "Common.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Debugging/Errors.h"
+#include "Logging/Log.h"
 #include "Utilities/ByteConverter.h"
 
 class ByteBufferException
-- 
cgit v1.2.3


From 2e0f8fb6e558088b33bdee83bc5ff20014e983b3 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 09:23:19 -0600
Subject: * Nope not yet

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/BattleGround.h         |  4 ++--
 src/server/game/Combat/HostileRefManager.h           |  2 +-
 src/server/game/Combat/ThreatManager.h               |  6 +++---
 src/server/game/Entities/Creature/Creature.h         |  4 ++--
 src/server/game/Entities/Object/Updates/UpdateMask.h |  2 +-
 src/server/game/Entities/Player/Player.h             | 10 +++++-----
 src/server/game/Entities/Unit/Unit.h                 | 12 ++++++------
 src/server/game/Groups/GroupRefManager.h             |  2 +-
 src/server/game/Groups/GroupReference.h              |  2 +-
 src/server/game/Loot/LootMgr.h                       |  8 ++++----
 src/server/game/Movement/FollowerRefManager.h        |  2 +-
 src/server/game/Movement/FollowerReference.h         |  2 +-
 src/server/game/Movement/MotionMaster.h              |  2 +-
 src/server/game/Quests/QuestDef.h                    |  2 +-
 src/server/shared/Utilities/EventProcessor.h         |  2 +-
 15 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h
index 6f46b6f8f6d..36fdb18f1bc 100644
--- a/src/server/game/BattleGrounds/BattleGround.h
+++ b/src/server/game/BattleGrounds/BattleGround.h
@@ -22,8 +22,8 @@
 #define __BATTLEGROUND_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "DBCEnums.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "DataStores/DBCEnums.h"
 
 class Creature;
 class GameObject;
diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
index 80b676312a1..ce5947ffc64 100644
--- a/src/server/game/Combat/HostileRefManager.h
+++ b/src/server/game/Combat/HostileRefManager.h
@@ -22,7 +22,7 @@
 #define _HOSTILEREFMANAGER
 
 #include "Common.h"
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Unit;
 class ThreatManager;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 723a553e9d7..517f4548121 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -22,9 +22,9 @@
 #define _THREATMANAGER
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Utilities/LinkedReference/Reference.h"
-#include "UnitEvents.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Dynamic/LinkedReference/Reference.h"
+#include "Combat/UnitEvents.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index d2d93d787da..0d4a4b0930e 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -23,11 +23,11 @@
 
 #include "Common.h"
 #include "Unit.h"
-#include "UpdateMask.h"
+#include "Updates/UpdateMask.h"
 #include "ItemPrototype.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Cell.h"
+#include "Grids/Cells/Cell.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
index 527bec42aa7..9db2fcecbcc 100644
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@@ -22,7 +22,7 @@
 #define __UPDATEMASK_H
 
 #include "UpdateFields.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 
 class UpdateMask
 {
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index d6de8679323..314b122d346 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -27,11 +27,11 @@
 #include "Item.h"
 
 #include "Database/DatabaseEnv.h"
-#include "NPCHandler.h"
-#include "QuestDef.h"
-#include "Group.h"
-#include "Bag.h"
-#include "WorldSession.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "Quests/QuestDef.h"
+#include "Groups/Group.h"
+#include "Item/Container/Bag.h"
+#include "Server/WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
 #include "Util.h"                                           // for Tokens typedef
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index c41a00f2e43..dc90411d88b 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -25,12 +25,12 @@
 #include "Object.h"
 #include "Server/Protocol/Opcodes.h"
 #include "SpellAuraDefines.h"
-#include "UpdateFields.h"
-#include "SharedDefines.h"
-#include "ThreatManager.h"
-#include "HostileRefManager.h"
-#include "FollowerReference.h"
-#include "FollowerRefManager.h"
+#include "Updates/UpdateFields.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Combat/ThreatManager.h"
+#include "Combat/HostileRefManager.h"
+#include "Movement/FollowerReference.h"
+#include "Movement/FollowerRefManager.h"
 #include "Utilities/EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
index 4fdeba2dd8c..f80e8d0989a 100644
--- a/src/server/game/Groups/GroupRefManager.h
+++ b/src/server/game/Groups/GroupRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFMANAGER
 #define _GROUPREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index 76f54c5230f..530f6dd8f10 100644
--- a/src/server/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFERENCE_H
 #define _GROUPREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 65fe3de22e1..55bb35eda6f 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -22,10 +22,10 @@
 #define TRINITY_LOOTMGR_H
 
 #include "ItemEnchantmentMgr.h"
-#include "ByteBuffer.h"
-#include "Utilities/LinkedReference/RefManager.h"
-#include "SharedDefines.h"
-#include "ConditionMgr.h"
+#include "Packets/ByteBuffer.h"
+#include "Dynamic/LinkedReference/RefManager.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Conditions/ConditionMgr.h"
 
 #include <map>
 #include <vector>
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index c2068b36f81..a0364e03db4 100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Unit;
 class TargetedMovementGeneratorBase;
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index e468f79f017..db66ec4d022 100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 class TargetedMovementGeneratorBase;
 class Unit;
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index c4082ba086a..5bd81cd965c 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include <vector>
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "Object.h"
 
 class MovementGenerator;
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 20d4ca3d28d..8da1f822b45 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_QUEST_H
 #define TRINITYCORE_QUEST_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Database/DatabaseEnv.h"
 
 #include <string>
diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h
index 2712967e1b7..421f88b659a 100644
--- a/src/server/shared/Utilities/EventProcessor.h
+++ b/src/server/shared/Utilities/EventProcessor.h
@@ -21,7 +21,7 @@
 #ifndef __EVENTPROCESSOR_H
 #define __EVENTPROCESSOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 #include<map>
 
-- 
cgit v1.2.3


From 15f8bbe9ca7a41d99de31ff32e2a919538d11066 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 12:08:15 -0600
Subject: * More cleanup

--HG--
branch : trunk
---
 src/server/game/AI/CoreAI/GuardAI.cpp              |   2 +-
 src/server/game/AI/CoreAI/GuardAI.h                |   2 +-
 src/server/game/AI/CoreAI/PetAI.cpp                |   4 +-
 src/server/game/AI/CoreAI/PetAI.h                  |   2 +-
 src/server/game/AI/CoreAI/ReactorAI.cpp            |   6 +-
 src/server/game/AI/CoreAI/TotemAI.cpp              |   6 +-
 src/server/game/AI/CoreAI/TotemAI.h                |   2 +-
 src/server/game/AI/CoreAI/UnitAI.h                 |   2 +-
 src/server/game/AI/CreatureAI.h                    |   2 +-
 src/server/game/AI/CreatureAIImpl.h                |   2 +-
 src/server/game/AI/CreatureAIRegistry.cpp          |  18 +-
 src/server/game/AI/CreatureAISelector.cpp          |   2 +-
 src/server/game/AI/EventAI/CreatureEventAI.cpp     |   8 +-
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp  |   4 +-
 src/server/game/Accounts/AccountMgr.cpp            |   4 +-
 src/server/game/Achievements/AchievementMgr.cpp    |  16 +-
 src/server/game/Addons/AddonMgr.cpp                |   6 +-
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h |   2 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   |  10 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.h     |   4 +-
 src/server/game/BattleGrounds/ArenaTeam.cpp        |   2 +-
 src/server/game/BattleGrounds/BattleGround.cpp     |  12 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp  |  34 +-
 .../game/BattleGrounds/Zones/BattleGroundAA.cpp    |   2 +-
 .../game/BattleGrounds/Zones/BattleGroundAB.cpp    |   6 +-
 .../game/BattleGrounds/Zones/BattleGroundAV.cpp    |   6 +-
 .../game/BattleGrounds/Zones/BattleGroundBE.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundDS.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundEY.cpp    |   6 +-
 .../game/BattleGrounds/Zones/BattleGroundEY.h      |   2 +-
 .../game/BattleGrounds/Zones/BattleGroundIC.cpp    |   2 +-
 .../game/BattleGrounds/Zones/BattleGroundNA.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundRB.cpp    |   2 +-
 .../game/BattleGrounds/Zones/BattleGroundRL.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundRV.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundSA.cpp    |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundWS.cpp    |   4 +-
 src/server/game/Chat/Channels/Channel.h            |   4 +-
 src/server/game/Chat/Chat.h                        |   2 +-
 src/server/game/Chat/Commands/Debugcmds.cpp        |  16 +-
 src/server/game/Chat/Commands/Level0.cpp           |   6 +-
 src/server/game/DataStores/DBCStores.h             |   4 +-
 src/server/game/DungeonFinding/LFG.h               |   2 +-
 src/server/game/Entities/Corpse/Corpse.h           |   2 +-
 src/server/game/Entities/Creature/GossipDef.h      |   2 +-
 src/server/game/Entities/GameObject/GameObject.h   |   2 +-
 src/server/game/Entities/Player/Player.h           |  12 +-
 src/server/game/Events/GameEventMgr.h              |   4 +-
 src/server/game/Globals/ObjectMgr.h                |  12 +-
 src/server/game/Grids/GridLoader.h                 |   4 +-
 src/server/game/Grids/Notifiers/GridNotifiers.h    |   8 +-
 .../game/Grids/Notifiers/GridNotifiersImpl.h       |   6 +-
 src/server/game/Grids/ObjectGridLoader.h           |  10 +-
 src/server/game/Instances/InstanceSaveMgr.cpp      |   2 +-
 src/server/game/Instances/InstanceSaveMgr.h        |   4 +-
 src/server/game/Maps/MapReference.h                |   2 +-
 src/server/game/Movement/DestinationHolder.h       |   4 +-
 src/server/game/Movement/MovementGenerator.h       |   2 +-
 .../MovementGenerators/WaypointMovementGenerator.h |   4 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.h    |   4 +-
 src/server/game/Reputation/ReputationMgr.h         |   8 +-
 src/server/game/Scripting/ScriptMgr.h              |   4 +-
 src/server/game/Spells/Spell.h                     |   4 +-
 src/server/game/Spells/SpellMgr.h                  |   4 +-
 src/server/scripts/CMakeLists.txt                  | 662 ++++++++++-----------
 src/server/shared/DataStores/DBCStore.h            |   2 +-
 src/server/shared/Dynamic/FactoryHolder.h          |   4 +-
 src/server/shared/Dynamic/ObjectRegistry.h         |   4 +-
 src/server/shared/SystemConfig.h                   |   2 +-
 69 files changed, 509 insertions(+), 509 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 19d5b5d8354..f4da814e86b 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GuardAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 73e3692a770..3d884e28906 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_GUARDAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 09ec8fae53f..72f0db20cb5 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PetAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Pet.h"
 #include "Player.h"
 #include "DBCStores.h"
@@ -28,7 +28,7 @@
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 int PetAI::Permissible(const Creature *creature)
 {
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index f6087a129ae..52568999cd1 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_PETAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Spell;
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index fdca6314747..f5e3739ccbf 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ByteBuffer.h"
+#include "Packets/ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Debugging/Errors.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index a6464f189e8..58045153efd 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -25,9 +25,9 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Grids/Cells/CellImpl.h"
 
 int
 TotemAI::Permissible(const Creature *creature)
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 34f4dfa9945..63459ace023 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_TOTEMAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
index 62b7090a2d0..3033f0556db 100644
--- a/src/server/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_UNITAI_H
 #define TRINITY_UNITAI_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include <list>
 #include "Unit.h"
 
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index c03d3dd09d0..58020c785dd 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
 
-#include "UnitAI.h"
+#include "AI/CoreAI/UnitAI.h"
 #include "Common.h"
 
 class WorldObject;
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index d2f96ffcabc..0f05d233891 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -19,7 +19,7 @@
 #define CREATUREAIIMPL_H
 
 #include "Common.h"
-#include "Platform/Define.h"
+#include "Define.h"
 #include "TemporarySummon.h"
 #include "CreatureAI.h"
 #include "SpellMgr.h"
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 9db30a0a5c4..7b96e7a97d1 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "PassiveAI.h"
-#include "ReactorAI.h"
-#include "CombatAI.h"
-#include "GuardAI.h"
-#include "PetAI.h"
-#include "TotemAI.h"
-#include "CreatureEventAI.h"
-#include "RandomMovementGenerator.h"
-#include "MovementGeneratorImpl.h"
+#include "CoreAI/PassiveAI.h"
+#include "CoreAI/ReactorAI.h"
+#include "CoreAI/CombatAI.h"
+#include "CoreAI/GuardAI.h"
+#include "CoreAI/PetAI.h"
+#include "CoreAI/TotemAI.h"
+#include "EventAI/CreatureEventAI.h"
+#include "Movement/MovementGenerators/RandomMovementGenerator.h"
+#include "Movement/MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index d3fd5a8aed9..6985edaaf2b 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -20,7 +20,7 @@
 
 #include "Creature.h"
 #include "CreatureAISelector.h"
-#include "PassiveAI.h"
+#include "AI/CoreAI/PassiveAI.h"
 #include "Policies/SingletonImp.h"
 #include "MovementGenerator.h"
 #include "Pet.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 47c8e9e6ad8..4162a002d99 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -24,11 +24,11 @@
 #include "ObjectMgr.h"
 #include "Spell.h"
 #include "World.h"
-#include "Cell.h"
-#include "CellImpl.h"
+#include "Grids/Cells/Cell.h"
+#include "Grids/Cells/CellImpl.h"
 #include "GameEventMgr.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 83d62ca74dc..f24226ee913 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -22,10 +22,10 @@
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "ObjectDefines.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 52906fb5454..8089b4d624d 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -24,8 +24,8 @@
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Util.h"
-#include "Auth/Sha1.h"
+#include "Utilities/Util.h"
+#include "Cryptography/SHA1.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index e0a79fc71ed..9f449105005 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -20,24 +20,24 @@
 #include "DBCEnums.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "Policies/SingletonImp.h"
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
-#include "CellImpl.h"
-#include "GameEventMgr.h"
-#include "GridNotifiersImpl.h"
-#include "Guild.h"
-#include "Language.h"
+#include "Grids/Cells/CellImpl.h"
+#include "Events/GameEventMgr.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Guilds/Guild.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "SpellMgr.h"
 
 #include "MapManager.h"
 #include "BattleGround.h"
-#include "BattleGroundAB.h"
+#include "BattleGrounds/Zones/BattleGroundAB.h"
 #include "Map.h"
 #include "InstanceData.h"
 
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index 66e4fbc8765..b87ddd023f7 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -24,9 +24,9 @@
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Util.h"
-#include "Auth/Sha1.h"
-#include "ProgressBar.h"
+#include "Utilities/Util.h"
+#include "Cryptography/SHA1.h"
+#include "Utilities/ProgressBar.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index 208a09aa0b2..08e93fca232 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -2,7 +2,7 @@
 #define AUCTION_HOUSE_BOT_H
 
 #include "World.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "ItemPrototype.h"
 
 #define AHB_GREY        0
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index ddd44bbefa2..5f00d36ba45 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -20,8 +20,8 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
 #include "Policies/SingletonImp.h"
@@ -30,9 +30,9 @@
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
-#include "Language.h"
-#include "Log.h"
-#include "ProgressBar.h"
+#include "Miscellaneous/Language.h"
+#include "Logging/Log.h"
+#include "Utilities/ProgressBar.h"
 #include <vector>
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index b92cec986c7..2c29986f87a 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -23,9 +23,9 @@
 
 #include "Policies/Singleton.h"
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
-#include "AuctionHouseBot.h"
+#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
 
 class Item;
 class Player;
diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp
index 4224ff6357a..b5fe5c16dfe 100644
--- a/src/server/game/BattleGrounds/ArenaTeam.cpp
+++ b/src/server/game/BattleGrounds/ArenaTeam.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "World.h"
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 5bfe2e139b6..ed8ad8b62a8 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -21,21 +21,21 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "Formulas.h"
-#include "GridNotifiersImpl.h"
+#include "Miscellaneous/Formulas.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "Group.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "MapManager.h"
 #include "Object.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 namespace Trinity
 {
@@ -1962,4 +1962,4 @@ void BattleGround::RewardXPAtKill(Player* plr, Player* victim)
         if (Pet* pet = plr->GetPet())
             pet->GivePetXP(xp);
     }    
-}
\ No newline at end of file
+}
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index 3bbe8c3cf31..faf8b517f15 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -21,33 +21,33 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Policies/SingletonImp.h"
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
-#include "BattleGroundAV.h"
-#include "BattleGroundAB.h"
-#include "BattleGroundEY.h"
-#include "BattleGroundWS.h"
-#include "BattleGroundNA.h"
-#include "BattleGroundBE.h"
-#include "BattleGroundAA.h"
-#include "BattleGroundRL.h"
-#include "BattleGroundSA.h"
-#include "BattleGroundDS.h"
-#include "BattleGroundRV.h"
-#include "BattleGroundIC.h"
-#include "BattleGroundRB.h"
+#include "Zones/BattleGroundAV.h"
+#include "Zones/BattleGroundAB.h"
+#include "Zones/BattleGroundEY.h"
+#include "Zones/BattleGroundWS.h"
+#include "Zones/BattleGroundNA.h"
+#include "Zones/BattleGroundBE.h"
+#include "Zones/BattleGroundAA.h"
+#include "Zones/BattleGroundRL.h"
+#include "Zones/BattleGroundSA.h"
+#include "Zones/BattleGroundDS.h"
+#include "Zones/BattleGroundRV.h"
+#include "Zones/BattleGroundIC.h"
+#include "Zones/BattleGroundRB.h"
 #include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
 #include "Player.h"
 #include "GameEventMgr.h"
-#include "ProgressBar.h"
-#include "SharedDefines.h"
-#include "Formulas.h"
+#include "Utilities/ProgressBar.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Miscellaneous/Formulas.h"
 
 INSTANTIATE_SINGLETON_1(BattleGroundMgr);
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
index 56cf3ebed15..9b2dd152c5e 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
@@ -20,7 +20,7 @@
 
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
index 38671e85597..549b844cd20 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
@@ -19,16 +19,16 @@
  */
 
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
index 7f5482cbf16..32334840f51 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
@@ -19,13 +19,13 @@
  */
 
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "Formulas.h"
+#include "Miscellaneous/Formulas.h"
 #include "GameObject.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
index d6debe45ae3..e5199115bcd 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
index 9036ef83f93..8a4ca9fb497 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
index 20f023e4c2a..a81a54f6b98 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
@@ -20,15 +20,15 @@
 
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index 4fe23c4c821..d4bd89552be 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -21,7 +21,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 class BattleGround;
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
index 8dbcc81e5c6..8e759046f47 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
@@ -19,7 +19,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
index 793cf13b3cb..09f8fef44de 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
index cf22154ed11..2777268a33c 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
@@ -21,7 +21,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
index ef2ec3cfa94..94374ace289 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
index fcc53dbbcf9..32e578ae5ed 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
@@ -21,9 +21,9 @@
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "GameObject.h"
 
 BattleGroundRV::BattleGroundRV()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
index ccde43ce948..f67ad9b3300 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 
 BattleGroundSA::BattleGroundSA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 71872511274..2eb94ca9958 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -22,13 +22,13 @@
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index d0b5923e30e..cafa814e1c9 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -27,9 +27,9 @@
 
 #include "Common.h"
 
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 enum ChatNotify
 {
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 58e6f6214c8..6aa42995663 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
 class ChatHandler;
 class WorldSession;
diff --git a/src/server/game/Chat/Commands/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp
index ee8c623c3d0..247e67ed135 100644
--- a/src/server/game/Chat/Commands/Debugcmds.cpp
+++ b/src/server/game/Chat/Commands/Debugcmds.cpp
@@ -20,22 +20,22 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Vehicle.h"
 #include "Player.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "Unit.h"
 #include "GossipDef.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
-#include "Cell.h"
-#include "CellImpl.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Cells/Cell.h"
+#include "Grids/Cells/CellImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "SpellMgr.h"
 #include "ScriptMgr.h"
 
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index ed021ac00d4..fd6dc165fc6 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -22,14 +22,14 @@
 #include "Database/DatabaseEnv.h"
 #include "World.h"
 #include "Player.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "AccountMgr.h"
 #include "SystemConfig.h"
 #include "revision.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 bool ChatHandler::HandleHelpCommand(const char* args)
 {
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index b14814e07a1..f4404bce447 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -20,8 +20,8 @@
 #define TRINITY_DBCSTORES_H
 
 #include "Common.h"
-#include "Database/DBCStore.h"
-#include "DBCStructure.h"
+#include "DataStores/DBCStore.h"
+#include "DataStores/DBCStructure.h"
 
 #include <list>
 
diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index c1b55443852..a5461029c8d 100644
--- a/src/server/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
@@ -19,7 +19,7 @@
 #ifndef _LFG_H
 #define _LFG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Object.h"
 
 enum LfgRoles
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index bab95e99d14..17c8e597d87 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -23,7 +23,7 @@
 
 #include "Object.h"
 #include "Database/DatabaseEnv.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "LootMgr.h"
 
 enum CorpseType
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index ce2049cc23f..42ca4cc4ab3 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "QuestDef.h"
-#include "NPCHandler.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
 
 class WorldSession;
 
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 2154adf80c0..be760e9bf41 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_GAMEOBJECT_H
 
 #include "Common.h"
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 314b122d346..983d10f5e02 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -34,12 +34,12 @@
 #include "Server/WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
-#include "Util.h"                                           // for Tokens typedef
-#include "AchievementMgr.h"
-#include "ReputationMgr.h"
-#include "BattleGround.h"
-#include "DBCEnums.h"
-#include "LFG.h"
+#include "Utilities/Util.h"                                           // for Tokens typedef
+#include "Achievements/AchievementMgr.h"
+#include "Reputation/ReputationMgr.h"
+#include "BattleGrounds/BattleGround.h"
+#include "DataStores/DBCEnums.h"
+#include "DungeonFinding/LFG.h"
 
 #include<string>
 #include<vector>
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 2c3e41f5f20..2ad8fd3de59 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -22,8 +22,8 @@
 #define TRINITY_GAMEEVENT_MGR_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Platform/Define.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 
 #define max_ge_check_delay DAY  // 1 day in seconds
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 79b6ffdd0eb..d8a0f81c698 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -21,18 +21,18 @@
 #ifndef _OBJECTMGR_H
 #define _OBJECTMGR_H
 
-#include "Log.h"
+#include "Logging/Log.h"
 #include "Object.h"
-#include "Bag.h"
+#include "Entities/Item/Container/Bag.h"
 #include "Creature.h"
 #include "Player.h"
-#include "DynamicObject.h"
+#include "Entities/DynamicObject/DynamicObject.h"
 #include "GameObject.h"
-#include "Corpse.h"
+#include "Entities/Corpse/Corpse.h"
 #include "QuestDef.h"
-#include "Path.h"
+#include "Movement/Waypoints/Path.h"
 #include "ItemPrototype.h"
-#include "NPCHandler.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
 #include "Database/DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 03fa0f5b813..191ace29d34 100644
--- a/src/server/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
@@ -32,9 +32,9 @@
   GridLoader manages the grid (both local and remote).
  */
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Grid.h"
-#include "TypeContainerVisitor.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
 template
 <
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index b0abf0aae79..9cbcb078128 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -21,13 +21,13 @@
 #ifndef TRINITY_GRIDNOTIFIERS_H
 #define TRINITY_GRIDNOTIFIERS_H
 
-#include "ObjectGridLoader.h"
-#include "UpdateData.h"
+#include "Grids/ObjectGridLoader.h"
+#include "Updates/UpdateData.h"
 #include <iostream>
 
-#include "Corpse.h"
+#include "Entities/Corpse/Corpse.h"
 #include "Object.h"
-#include "DynamicObject.h"
+#include "Entities/DynamicObject/DynamicObject.h"
 #include "GameObject.h"
 #include "Player.h"
 #include "Unit.h"
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 26a9c0bd328..43cb94540c3 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -22,10 +22,10 @@
 #define TRINITY_GRIDNOTIFIERSIMPL_H
 
 #include "GridNotifiers.h"
-#include "WorldPacket.h"
-#include "Corpse.h"
+#include "Packets/WorldPacket.h"
+#include "Corpse/Corpse.h"
 #include "Player.h"
-#include "UpdateData.h"
+#include "Updates/UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index e890bf8d482..90e3383fbc8 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -21,11 +21,11 @@
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
 
-#include "Utilities/TypeList.h"
-#include "Platform/Define.h"
-#include "GameSystem/GridLoader.h"
-#include "GridDefines.h"
-#include "Cell.h"
+#include "Dynamic/TypeList.h"
+#include "Define.h"
+#include "Grids/GridLoader.h"
+#include "Grids/GridDefines.h"
+#include "Grids/Cells/Cell.h"
 
 class ObjectWorldLoader;
 
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index d67364966d6..2d3ba0d3b75 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -31,7 +31,7 @@
 #include "MapManager.h"
 #include "MapInstanced.h"
 #include "InstanceSaveMgr.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 #include "GridNotifiersImpl.h"
 #include "Config/ConfigEnv.h"
 #include "Transports.h"
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 91cd3d9ebe6..c8f6c756f2c 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -22,12 +22,12 @@
 #ifndef __InstanceSaveMgr_H
 #define __InstanceSaveMgr_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include <list>
 #include <map>
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "ObjectDefines.h"
diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index 7cd4fcde76c..c32be406af0 100644
--- a/src/server/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFERENCE_H
 #define _MAPREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 #include "Map.h"
 
 class MapReference : public Reference<Map, Player>
diff --git a/src/server/game/Movement/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h
index e09a153615c..7adf6f4cb11 100644
--- a/src/server/game/Movement/DestinationHolder.h
+++ b/src/server/game/Movement/DestinationHolder.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_DESTINATION_HOLDER_H
 #define TRINITY_DESTINATION_HOLDER_H
 
-#include "Platform/Define.h"
-#include "Timer.h"
+#include "Define.h"
+#include "Utilities/Timer.h"
 
 class WorldObject;
 class Map;
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index ab7a52c483e..fa7291b8601 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_MOVEMENTGENERATOR_H
 #define TRINITY_MOVEMENTGENERATOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 4b74e80e168..9216aac5d0c 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -29,8 +29,8 @@
 
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
-#include "WaypointManager.h"
-#include "Path.h"
+#include "Movement/Waypoints/WaypointManager.h"
+#include "Movement/Waypoints/Path.h"
 #include "Traveller.h"
 
 #include "Player.h"
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index cb42e4138e4..3587d270131 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -7,6 +7,6 @@
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "Database/SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
+#include "Server/Protocol/Opcodes.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 4c0fd778a4d..9fc0efdf850 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -20,10 +20,10 @@
 #define __TRINITY_REPUTATION_MGR_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Language.h"
-#include "DBCStructure.h"
-#include "QueryResult.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Miscellaneous/Language.h"
+#include "DataStores/DBCStructure.h"
+#include "Database/QueryResult.h"
 #include <map>
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index ed7200d5786..1814148e5e5 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -9,9 +9,9 @@
 #define SC_SCRIPTMGR_H
 
 #include "Common.h"
-#include "Platform/CompilerDefs.h"
+#include "CompilerDefs.h"
 #include "DBCStructure.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 
 class Player;
 class Creature;
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index a987e35e65d..ef21e4a14b3 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -21,8 +21,8 @@
 #ifndef __SPELL_H
 #define __SPELL_H
 
-#include "GridDefines.h"
-#include "SharedDefines.h"
+#include "Grids/GridDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
 class Unit;
 class Player;
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index 224760029e7..b6768348417 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -24,13 +24,13 @@
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
 #include "Database/SQLStorage.h"
 
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 
 #include "Player.h"
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index b9dfbc5fab2..2a2e2c84e19 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -4,8 +4,8 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 SET(scripts_STAT_SRCS
-   ../game/Scripting/ScriptedPch.cpp
-   ../game/Scripting/ScriptedPch.h
+   ../game/PrecompiledHeaders/ScriptPCH.cpp
+   ../game/PrecompiledHeaders/ScriptPCH.h
    ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
    ../game/AI/ScriptedAI/ScriptedEscortAI.h
    ../game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -19,176 +19,176 @@ SET(scripts_STAT_SRCS
    ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
    ../game/AI/ScriptedAI/ScriptedSimpleAI.h
    Custom/on_events.cpp
-   EasternKingdoms/alterac_valley/alterac_valley.cpp
-   EasternKingdoms/alterac_valley/boss_balinda.cpp
-   EasternKingdoms/alterac_valley/boss_drekthar.cpp
-   EasternKingdoms/alterac_valley/boss_galvangar.cpp
-   EasternKingdoms/alterac_valley/boss_vanndar.cpp
-   EasternKingdoms/blackrock_depths/blackrock_depths.cpp
-   EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
-   EasternKingdoms/blackrock_depths/boss_anubshiah.cpp
-   EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
-   EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp
-   EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
-   EasternKingdoms/blackrock_depths/boss_grizzle.cpp
-   EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
-   EasternKingdoms/blackrock_depths/boss_magmus.cpp
-   EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
-   EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp
-   EasternKingdoms/blackrock_depths/blackrock_depths.h
-   EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp
-   EasternKingdoms/blackrock_spire/blackrock_spire.cpp
-   EasternKingdoms/blackrock_spire/boss_drakkisath.cpp
-   EasternKingdoms/blackrock_spire/boss_gyth.cpp
-   EasternKingdoms/blackrock_spire/boss_halycon.cpp
-   EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp
-   EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp
-   EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
-   EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
-   EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
-   EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp
-   EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
-   EasternKingdoms/blackrock_spire/boss_the_beast.cpp
-   EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp
-   EasternKingdoms/blackrock_spire/blackrock_spire.h
-   EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp
-   EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
-   EasternKingdoms/blackwing_lair/boss_chromaggus.cpp
-   EasternKingdoms/blackwing_lair/boss_ebonroc.cpp
-   EasternKingdoms/blackwing_lair/boss_firemaw.cpp
-   EasternKingdoms/blackwing_lair/boss_flamegor.cpp
-   EasternKingdoms/blackwing_lair/boss_nefarian.cpp
-   EasternKingdoms/blackwing_lair/boss_razorgore.cpp
-   EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp
-   EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp
-   EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp
-   EasternKingdoms/deadmines/boss_mr_smite.cpp
-   EasternKingdoms/deadmines/deadmines.h
-   EasternKingdoms/deadmines/deadmines.cpp
-   EasternKingdoms/deadmines/instance_deadmines.cpp
-   EasternKingdoms/gnomeregan/gnomeregan.h
-   EasternKingdoms/gnomeregan/gnomeregan.cpp
-   EasternKingdoms/gnomeregan/instance_gnomeregan.cpp
-   EasternKingdoms/karazhan/boss_curator.cpp
-   EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp
-   EasternKingdoms/karazhan/boss_midnight.cpp
-   EasternKingdoms/karazhan/boss_moroes.cpp
-   EasternKingdoms/karazhan/boss_netherspite.cpp
-   EasternKingdoms/karazhan/boss_nightbane.cpp
-   EasternKingdoms/karazhan/boss_prince_malchezaar.cpp
-   EasternKingdoms/karazhan/boss_shade_of_aran.cpp
-   EasternKingdoms/karazhan/boss_terestian_illhoof.cpp
-   EasternKingdoms/karazhan/bosses_opera.cpp
-   EasternKingdoms/karazhan/karazhan.h
-   EasternKingdoms/karazhan/instance_karazhan.cpp
-   EasternKingdoms/karazhan/karazhan.cpp
-   EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
-   EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp
-   EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp
-   EasternKingdoms/magisters_terrace/boss_vexallus.cpp
-   EasternKingdoms/magisters_terrace/magisters_terrace.h
-   EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp
-   EasternKingdoms/magisters_terrace/magisters_terrace.cpp
-   EasternKingdoms/molten_core/boss_baron_geddon.cpp
-   EasternKingdoms/molten_core/boss_garr.cpp
-   EasternKingdoms/molten_core/boss_gehennas.cpp
-   EasternKingdoms/molten_core/boss_golemagg.cpp
-   EasternKingdoms/molten_core/boss_lucifron.cpp
-   EasternKingdoms/molten_core/boss_magmadar.cpp
-   EasternKingdoms/molten_core/boss_majordomo_executus.cpp
-   EasternKingdoms/molten_core/boss_ragnaros.cpp
-   EasternKingdoms/molten_core/boss_shazzrah.cpp
-   EasternKingdoms/molten_core/boss_sulfuron_harbinger.cpp
-   EasternKingdoms/molten_core/molten_core.h
-   EasternKingdoms/molten_core/instance_molten_core.cpp
-   EasternKingdoms/molten_core/molten_core.cpp
-   EasternKingdoms/scarlet_enclave/the_scarlet_enclave.cpp
-   EasternKingdoms/scarlet_enclave/chapter1.cpp
-   EasternKingdoms/scarlet_enclave/chapter2.cpp
-   EasternKingdoms/scarlet_enclave/chapter5.cpp
-   EasternKingdoms/scarlet_monastery/boss_arcanist_doan.cpp
-   EasternKingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
-   EasternKingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
-   EasternKingdoms/scarlet_monastery/boss_herod.cpp
-   EasternKingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
-   EasternKingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
-   EasternKingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
-   EasternKingdoms/scarlet_monastery/boss_scorn.cpp
-   EasternKingdoms/scarlet_monastery/boss_headless_horseman.cpp
-   EasternKingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
-   EasternKingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
-   EasternKingdoms/scarlet_monastery/scarlet_monastery.h
-   EasternKingdoms/scholomance/boss_darkmaster_gandling.cpp
-   EasternKingdoms/scholomance/boss_death_knight_darkreaver.cpp
-   EasternKingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
-   EasternKingdoms/scholomance/boss_illucia_barov.cpp
-   EasternKingdoms/scholomance/boss_instructor_malicia.cpp
-   EasternKingdoms/scholomance/boss_jandice_barov.cpp
-   EasternKingdoms/scholomance/boss_kormok.cpp
-   EasternKingdoms/scholomance/boss_lord_alexei_barov.cpp
-   EasternKingdoms/scholomance/boss_lorekeeper_polkelt.cpp
-   EasternKingdoms/scholomance/boss_ras_frostwhisper.cpp
-   EasternKingdoms/scholomance/boss_the_ravenian.cpp
-   EasternKingdoms/scholomance/boss_vectus.cpp
-   EasternKingdoms/scholomance/scholomance.h
-   EasternKingdoms/scholomance/instance_scholomance.cpp
-   EasternKingdoms/shadowfang_keep/shadowfang_keep.h
-   EasternKingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
-   EasternKingdoms/shadowfang_keep/shadowfang_keep.cpp
-   EasternKingdoms/stratholme/boss_baron_rivendare.cpp
-   EasternKingdoms/stratholme/boss_baroness_anastari.cpp
-   EasternKingdoms/stratholme/boss_cannon_master_willey.cpp
-   EasternKingdoms/stratholme/boss_dathrohan_balnazzar.cpp
-   EasternKingdoms/stratholme/boss_magistrate_barthilas.cpp
-   EasternKingdoms/stratholme/boss_maleki_the_pallid.cpp
-   EasternKingdoms/stratholme/boss_nerubenkan.cpp
-   EasternKingdoms/stratholme/boss_order_of_silver_hand.cpp
-   EasternKingdoms/stratholme/boss_postmaster_malown.cpp
-   EasternKingdoms/stratholme/boss_ramstein_the_gorger.cpp
-   EasternKingdoms/stratholme/boss_timmy_the_cruel.cpp
-   EasternKingdoms/stratholme/stratholme.h
-   EasternKingdoms/stratholme/instance_stratholme.cpp
-   EasternKingdoms/stratholme/stratholme.cpp
-   EasternKingdoms/sunken_temple/sunken_temple.h
-   EasternKingdoms/sunken_temple/instance_sunken_temple.cpp
-   EasternKingdoms/sunken_temple/sunken_temple.cpp
-   EasternKingdoms/sunwell_plateau/boss_kiljaeden.cpp
-   EasternKingdoms/sunwell_plateau/boss_muru.cpp
-   EasternKingdoms/sunwell_plateau/boss_eredar_twins.cpp
-   EasternKingdoms/sunwell_plateau/boss_felmyst.cpp
-   EasternKingdoms/sunwell_plateau/boss_brutallus.cpp
-   EasternKingdoms/sunwell_plateau/boss_kalecgos.cpp
-   EasternKingdoms/sunwell_plateau/sunwell_plateau.cpp
-   EasternKingdoms/sunwell_plateau/sunwell_plateau.h
-   EasternKingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
-   EasternKingdoms/uldaman/boss_archaedas.cpp
-   EasternKingdoms/uldaman/instance_uldaman.cpp
-   EasternKingdoms/uldaman/boss_ironaya.cpp
-   EasternKingdoms/uldaman/uldaman.cpp
-   EasternKingdoms/zulaman/boss_akilzon.cpp
-   EasternKingdoms/zulaman/boss_halazzi.cpp
-   EasternKingdoms/zulaman/boss_hexlord.cpp
-   EasternKingdoms/zulaman/boss_janalai.cpp
-   EasternKingdoms/zulaman/boss_nalorakk.cpp
-   EasternKingdoms/zulaman/boss_zuljin.cpp
-   EasternKingdoms/zulaman/zulaman.h
-   EasternKingdoms/zulaman/instance_zulaman.cpp
-   EasternKingdoms/zulaman/zulaman.cpp
-   EasternKingdoms/zulgurub/boss_arlokk.cpp
-   EasternKingdoms/zulgurub/boss_gahzranka.cpp
-   EasternKingdoms/zulgurub/boss_grilek.cpp
-   EasternKingdoms/zulgurub/boss_hakkar.cpp
-   EasternKingdoms/zulgurub/boss_hazzarah.cpp
-   EasternKingdoms/zulgurub/boss_jeklik.cpp
-   EasternKingdoms/zulgurub/boss_jindo.cpp
-   EasternKingdoms/zulgurub/boss_mandokir.cpp
-   EasternKingdoms/zulgurub/boss_marli.cpp
-   EasternKingdoms/zulgurub/boss_renataki.cpp
-   EasternKingdoms/zulgurub/boss_thekal.cpp
-   EasternKingdoms/zulgurub/boss_venoxis.cpp
-   EasternKingdoms/zulgurub/boss_wushoolay.cpp
-   EasternKingdoms/zulgurub/zulgurub.h
-   EasternKingdoms/zulgurub/instance_zulgurub.cpp
+   EasternKingdoms/AlteracValley/alterac_valley.cpp
+   EasternKingdoms/AlteracValley/boss_balinda.cpp
+   EasternKingdoms/AlteracValley/boss_drekthar.cpp
+   EasternKingdoms/AlteracValley/boss_galvangar.cpp
+   EasternKingdoms/AlteracValley/boss_vanndar.cpp
+   EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+   EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+   EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+   EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+   EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+   EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+   EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+   EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+   EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+   EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+   EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+   EasternKingdoms/BlackrockDepths//blackrock_depths.h
+   EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+   EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+   EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+   EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+   EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+   EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+   EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+   EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+   EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+   EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+   EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+   EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+   EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+   EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+   EasternKingdoms/BlackrockSpire/blackrock_spire.h
+   EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+   EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+   EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+   EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+   EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+   EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+   EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+   EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+   EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+   EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+   EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+   EasternKingdoms/Deadmines/boss_mr_smite.cpp
+   EasternKingdoms/Deadmines/deadmines.h
+   EasternKingdoms/Deadmines/deadmines.cpp
+   EasternKingdoms/Deadmines/instance_deadmines.cpp
+   EasternKingdoms/Gnomeregan/gnomeregan.h
+   EasternKingdoms/Gnomeregan/gnomeregan.cpp
+   EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+   EasternKingdoms/Karazhan/boss_curator.cpp
+   EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+   EasternKingdoms/Karazhan/boss_midnight.cpp
+   EasternKingdoms/Karazhan/boss_moroes.cpp
+   EasternKingdoms/Karazhan/boss_netherspite.cpp
+   EasternKingdoms/Karazhan/boss_nightbane.cpp
+   EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+   EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+   EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+   EasternKingdoms/Karazhan/bosses_opera.cpp
+   EasternKingdoms/Karazhan/karazhan.h
+   EasternKingdoms/Karazhan/instance_karazhan.cpp
+   EasternKingdoms/Karazhan/karazhan.cpp
+   EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+   EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+   EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+   EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+   EasternKingdoms/MagistersTerrace/magisters_terrace.h
+   EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+   EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+   EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+   EasternKingdoms/MoltenCore/boss_garr.cpp
+   EasternKingdoms/MoltenCore/boss_gehennas.cpp
+   EasternKingdoms/MoltenCore/boss_golemagg.cpp
+   EasternKingdoms/MoltenCore/boss_lucifron.cpp
+   EasternKingdoms/MoltenCore/boss_magmadar.cpp
+   EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+   EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+   EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+   EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+   EasternKingdoms/MoltenCore/molten_core.h
+   EasternKingdoms/MoltenCore/instance_molten_core.cpp
+   EasternKingdoms/MoltenCore/molten_core.cpp
+   EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+   EasternKingdoms/ScarletEnclave/chapter1.cpp
+   EasternKingdoms/ScarletEnclave/chapter2.cpp
+   EasternKingdoms/ScarletEnclave/chapter5.cpp
+   EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+   EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+   EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+   EasternKingdoms/ScarletMonastery/boss_herod.cpp
+   EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+   EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+   EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+   EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+   EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+   EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+   EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+   EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+   EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+   EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+   EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+   EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+   EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+   EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+   EasternKingdoms/Scholomance/boss_kormok.cpp
+   EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+   EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+   EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+   EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+   EasternKingdoms/Scholomance/boss_vectus.cpp
+   EasternKingdoms/Scholomance/scholomance.h
+   EasternKingdoms/Scholomance/instance_scholomance.cpp
+   EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+   EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+   EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+   EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+   EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+   EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+   EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+   EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+   EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+   EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+   EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+   EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+   EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+   EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+   EasternKingdoms/Stratholme/stratholme.h
+   EasternKingdoms/Stratholme/instance_stratholme.cpp
+   EasternKingdoms/Stratholme/stratholme.cpp
+   EasternKingdoms/SunkenTemple/sunken_temple.h
+   EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+   EasternKingdoms/SunkenTemple/sunken_temple.cpp
+   EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+   EasternKingdoms/SunwellPlateau/boss_muru.cpp
+   EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+   EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+   EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+   EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+   EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+   EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+   EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+   EasternKingdoms/Uldaman/boss_archaedas.cpp
+   EasternKingdoms/Uldaman/instance_uldaman.cpp
+   EasternKingdoms/Uldaman/boss_ironaya.cpp
+   EasternKingdoms/Uldaman/uldaman.cpp
+   EasternKingdoms/ZulAman/boss_akilzon.cpp
+   EasternKingdoms/ZulAman/boss_halazzi.cpp
+   EasternKingdoms/ZulAman/boss_hexlord.cpp
+   EasternKingdoms/ZulAman/boss_janalai.cpp
+   EasternKingdoms/ZulAman/boss_nalorakk.cpp
+   EasternKingdoms/ZulAman/boss_zuljin.cpp
+   EasternKingdoms/ZulAman/zulaman.h
+   EasternKingdoms/ZulAman/instance_zulaman.cpp
+   EasternKingdoms/ZulAman/zulaman.cpp
+   EasternKingdoms/ZulGurub/boss_arlokk.cpp
+   EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+   EasternKingdoms/ZulGurub/boss_grilek.cpp
+   EasternKingdoms/ZulGurub/boss_hakkar.cpp
+   EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+   EasternKingdoms/ZulGurub/boss_jeklik.cpp
+   EasternKingdoms/ZulGurub/boss_jindo.cpp
+   EasternKingdoms/ZulGurub/boss_mandokir.cpp
+   EasternKingdoms/ZulGurub/boss_marli.cpp
+   EasternKingdoms/ZulGurub/boss_renataki.cpp
+   EasternKingdoms/ZulGurub/boss_thekal.cpp
+   EasternKingdoms/ZulGurub/boss_venoxis.cpp
+   EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+   EasternKingdoms/ZulGurub/zulgurub.h
+   EasternKingdoms/ZulGurub/instance_zulgurub.cpp
    EasternKingdoms/alterac_mountains.cpp
    EasternKingdoms/arathi_highlands.cpp
    EasternKingdoms/blasted_lands.cpp
@@ -219,82 +219,82 @@ SET(scripts_STAT_SRCS
    Examples/example_escort.cpp
    Examples/example_gossip_codebox.cpp
    Examples/example_misc.cpp
-   Kalimdor/blackfathom_depths/boss_gelihast.cpp
-   Kalimdor/blackfathom_depths/boss_kelris.cpp
-   Kalimdor/blackfathom_depths/boss_aku_mai.cpp
-   Kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
-   Kalimdor/blackfathom_depths/blackfathom_deeps.cpp
-   Kalimdor/blackfathom_depths/blackfathom_deeps.h
-   Kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
-   Kalimdor/caverns_of_time/dark_portal/dark_portal.h
-   Kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
-   Kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal.h
-   Kalimdor/caverns_of_time/hyjal/hyjal.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal_trash.h
-   Kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjalAI.h
-   Kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
-   Kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
-   Kalimdor/maraudon/boss_celebras_the_cursed.cpp
-   Kalimdor/maraudon/boss_landslide.cpp
-   Kalimdor/maraudon/boss_noxxion.cpp
-   Kalimdor/maraudon/boss_princess_theradras.cpp
-   Kalimdor/onyxias_lair/boss_onyxia.cpp
-   Kalimdor/onyxias_lair/instance_onyxias_lair.cpp
-   Kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
-   Kalimdor/razorfen_downs/razorfen_downs.cpp
-   Kalimdor/razorfen_downs/instance_razorfen_downs.cpp
-   Kalimdor/razorfen_downs/razorfen_downs.h
-   Kalimdor/razorfen_kraul/razorfen_kraul.h
-   Kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
-   Kalimdor/razorfen_kraul/razorfen_kraul.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
-   Kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
-   Kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
-   Kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
-   Kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
-   Kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
-   Kalimdor/wailing_caverns/wailing_caverns.h
-   Kalimdor/wailing_caverns/instance_wailing_caverns.cpp
-   Kalimdor/wailing_caverns/wailing_caverns.cpp
-   Kalimdor/zulfarrak/zulfarrak.cpp
-   Kalimdor/zulfarrak/instance_zulfarrak.cpp
+   Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+   Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+   Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+   Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+   Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+   Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_BattleForMountHyjal.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/instance_CullingOfStratholme.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.h
+   Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.h
+   Kalimdor/CavernsOfTime/DarkPortal/instance_DarkPortal.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.h
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_EscapeFromDurnholdeKeep.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.cpp
+   Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+   Kalimdor/Maraudon/boss_landslide.cpp
+   Kalimdor/Maraudon/boss_noxxion.cpp
+   Kalimdor/Maraudon/boss_princess_theradras.cpp
+   Kalimdor/OnyxiasLair/boss_onyxia.cpp
+   Kalimdor/OnyxiasLair/instance_OnyxiasLair.cpp
+   Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+   Kalimdor/RazorfenDowns/RazorfenDowns.cpp
+   Kalimdor/RazorfenDowns/instance_RazorfenDowns.cpp
+   Kalimdor/RazorfenDowns/RazorfenDowns.h
+   Kalimdor/RazorfenKraul/RazorfenKraul.h
+   Kalimdor/RazorfenKraul/instance_RazorfenKraul.cpp
+   Kalimdor/RazorfenKraul/RazorfenKraul.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+   Kalimdor/RuinsOfAhnQiraj/RuinsOfAhnQiraj.h
+   Kalimdor/RuinsOfAhnQiraj/instance_RuinsOfAhnQiraj.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+   Kalimdor/TempleOfAhnQiraj/TempleOfAhnQiraj.h
+   Kalimdor/TempleOfAhnQiraj/instance_TempleOfAhnQiraj.cpp
+   Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+   Kalimdor/WailingCaverns/WailingCaverns.h
+   Kalimdor/WailingCaverns/instance_WailingCaverns.cpp
+   Kalimdor/WailingCaverns/WailingCaverns.cpp
+   Kalimdor/ZulFarrak/ZulFarrak.cpp
+   Kalimdor/ZulFarrak/instance_ZulFarrak.cpp
    Kalimdor/ashenvale.cpp
    Kalimdor/azshara.cpp
    Kalimdor/azuremyst_isle.cpp
@@ -318,88 +318,88 @@ SET(scripts_STAT_SRCS
    Kalimdor/thunder_bluff.cpp
    Kalimdor/ungoro_crater.cpp
    Kalimdor/winterspring.cpp
-   Northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
-   Northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
-   Northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
-   Northrend/azjol_nerub/ahnkahet/ahnkahet.h
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
-   Northrend/draktharon_keep/instance_drak_tharon_keep.cpp
-   Northrend/draktharon_keep/boss_trollgore.cpp
-   Northrend/draktharon_keep/boss_novos.cpp
-   Northrend/draktharon_keep/boss_dred.cpp
-   Northrend/draktharon_keep/boss_tharon_ja.cpp
-   Northrend/draktharon_keep/drak_tharon_keep.h
-   Northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
-   Northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
-   Northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
-   Northrend/frozen_halls/forge_of_souls/forge_of_souls.h
-   Northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
-   Northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
-   Northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
-   Northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
-   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
-   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
-   Northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
-   Northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
-   Northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
-   Northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
-   Northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
-   Northrend/frozen_halls/pit_of_saron/pit_of_saron.h
-   Northrend/gundrak/instance_gundrak.cpp
-   Northrend/gundrak/boss_slad_ran.cpp
-   Northrend/gundrak/boss_moorabi.cpp
-   Northrend/gundrak/boss_drakkari_colossus.cpp
-   Northrend/gundrak/boss_gal_darah.cpp
-   Northrend/gundrak/boss_eck.cpp
-   Northrend/gundrak/gundrak.h
-   Northrend/naxxramas/boss_anubrekhan.cpp
-   Northrend/naxxramas/boss_faerlina.cpp
-   Northrend/naxxramas/boss_gluth.cpp
-   Northrend/naxxramas/boss_gothik.cpp
-   Northrend/naxxramas/boss_grobbulus.cpp
-   Northrend/naxxramas/boss_heigan.cpp
-   Northrend/naxxramas/boss_kelthuzad.cpp
-   Northrend/naxxramas/boss_four_horsemen.cpp
-   Northrend/naxxramas/boss_loatheb.cpp
-   Northrend/naxxramas/boss_maexxna.cpp
-   Northrend/naxxramas/boss_noth.cpp
-   Northrend/naxxramas/boss_patchwerk.cpp
-   Northrend/naxxramas/boss_razuvious.cpp
-   Northrend/naxxramas/boss_sapphiron.cpp
-   Northrend/naxxramas/boss_thaddius.cpp
-   Northrend/naxxramas/naxxramas.h
-   Northrend/naxxramas/instance_naxxramas.cpp
-   Northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
-   Northrend/nexus/eye_of_eternity/boss_malygos.cpp
-   Northrend/nexus/eye_of_eternity/eye_of_eternity.h
-   Northrend/nexus/nexus/instance_nexus.cpp
-   Northrend/nexus/nexus/boss_magus_telestra.cpp
-   Northrend/nexus/nexus/boss_anomalus.cpp
-   Northrend/nexus/nexus/boss_ormorok.cpp
-   Northrend/nexus/nexus/boss_keristrasza.cpp
-   Northrend/nexus/nexus/commander_stoutbeard.cpp
-   Northrend/nexus/nexus/commander_kolurg.cpp
-   Northrend/nexus/nexus/nexus.h
-   Northrend/nexus/oculus/instance_oculus.cpp
-   Northrend/nexus/oculus/boss_drakos.cpp
-   Northrend/nexus/oculus/boss_urom.cpp
-   Northrend/nexus/oculus/boss_varos.cpp
-   Northrend/nexus/oculus/boss_eregos.cpp
-   Northrend/nexus/oculus/oculus.h
-   Northrend/nexus/oculus/oculus.cpp
+   Northrend/AzjolNerub/AzjolNerub/instance_AzjolNerub.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+   Northrend/AzjolNerub/AzjolNerub/AzjolNerub.h
+   Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+   Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/instance_TrialOfTheChampion.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.h
+   Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+   Northrend/DraktharonKeep/boss_trollgore.cpp
+   Northrend/DraktharonKeep/boss_novos.cpp
+   Northrend/DraktharonKeep/boss_dred.cpp
+   Northrend/DraktharonKeep/boss_tharon_ja.cpp
+   Northrend/DraktharonKeep/drak_tharon_keep.h
+   Northrend/FrozenHalls/ForgeOfSouls/instance_ForgeOfSouls.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.h
+   Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.cpp
+   Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+   Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+   Northrend/FrozenHalls/HallsOfReflection/instance_HallsOfReflection.cpp
+   Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.cpp
+   Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.h
+   Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+   Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+   Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+   Northrend/FrozenHalls/PitOfSaron/instance_PitOfSaron.cpp
+   Northrend/FrozenHalls/PitOfSaron/PitOfSaron.cpp
+   Northrend/FrozenHalls/PitOfSaron/PitOfSaron.h
+   Northrend/Gundrak/instance_Gundrak.cpp
+   Northrend/Gundrak/boss_slad_ran.cpp
+   Northrend/Gundrak/boss_moorabi.cpp
+   Northrend/Gundrak/boss_drakkari_colossus.cpp
+   Northrend/Gundrak/boss_gal_darah.cpp
+   Northrend/Gundrak/boss_eck.cpp
+   Northrend/Gundrak/Gundrak.h
+   Northrend/Naxxramas/boss_anubrekhan.cpp
+   Northrend/Naxxramas/boss_faerlina.cpp
+   Northrend/Naxxramas/boss_gluth.cpp
+   Northrend/Naxxramas/boss_gothik.cpp
+   Northrend/Naxxramas/boss_grobbulus.cpp
+   Northrend/Naxxramas/boss_heigan.cpp
+   Northrend/Naxxramas/boss_kelthuzad.cpp
+   Northrend/Naxxramas/boss_four_horsemen.cpp
+   Northrend/Naxxramas/boss_loatheb.cpp
+   Northrend/Naxxramas/boss_maexxna.cpp
+   Northrend/Naxxramas/boss_noth.cpp
+   Northrend/Naxxramas/boss_patchwerk.cpp
+   Northrend/Naxxramas/boss_razuvious.cpp
+   Northrend/Naxxramas/boss_sapphiron.cpp
+   Northrend/Naxxramas/boss_thaddius.cpp
+   Northrend/Naxxramas/Naxxramas.h
+   Northrend/Naxxramas/instance_Naxxramas.cpp
+   Northrend/Nexus/EyeOfEternity/instance_EyeOfEternity.cpp
+   Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+   Northrend/Nexus/EyeOfEternity/EyeOfEternity.h
+   Northrend/Nexus/Nexus/instance_Nexus.cpp
+   Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+   Northrend/Nexus/Nexus/boss_anomalus.cpp
+   Northrend/Nexus/Nexus/boss_ormorok.cpp
+   Northrend/Nexus/Nexus/boss_keristrasza.cpp
+   Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+   Northrend/Nexus/Nexus/commander_kolurg.cpp
+   Northrend/Nexus/Nexus/Nexus.h
+   Northrend/Nexus/Oculus/instance_Oculus.cpp
+   Northrend/Nexus/Oculus/boss_drakos.cpp
+   Northrend/Nexus/Oculus/boss_urom.cpp
+   Northrend/Nexus/Oculus/boss_varos.cpp
+   Northrend/Nexus/Oculus/boss_eregos.cpp
+   Northrend/Nexus/Oculus/Oculus.h
+   Northrend/Nexus/Oculus/Oculus.cpp
    Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
    Northrend/obsidian_sanctum/boss_sartharion.cpp
    Northrend/obsidian_sanctum/obsidian_sanctum.h
@@ -472,7 +472,7 @@ SET(scripts_STAT_SRCS
    Northrend/crystalsong_forest.cpp
    Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
    Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
-   Outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+   Outland/auchindoun/mana_tombs/boss_Nexusprince_shaffar.cpp
    Outland/auchindoun/mana_tombs/boss_pandemonius.cpp
    Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
    Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 61e2f7a6d06..cd1d1881d68 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -20,7 +20,7 @@
 #define DBCSTORE_H
 
 #include "DBCFileLoader.h"
-#include "Log.h"
+#include "Logging/Log.h"
 
 struct SqlDbc
 {
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index 282968d6097..fd5925f5f75 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_FACTORY_HOLDER
 #define TRINITY_FACTORY_HOLDER
 
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
 #include "ObjectRegistry.h"
 #include "Policies/SingletonImp.h"
 
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index e6619427885..eaf8e1acd2d 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_OBJECTREGISTRY_H
 #define TRINITY_OBJECTREGISTRY_H
 
-#include "Platform/Define.h"
-#include "Utilities/UnorderedMap.h"
+#include "Define.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Policies/Singleton.h"
 
 #include <string>
diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
index ac531cbbc94..fd380d72b79 100644
--- a/src/server/shared/SystemConfig.h
+++ b/src/server/shared/SystemConfig.h
@@ -24,7 +24,7 @@
 #ifndef TRINITY_SYSTEMCONFIG_H
 #define TRINITY_SYSTEMCONFIG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "revision.h"
 
 #define _PACKAGENAME "TrinityCore "
-- 
cgit v1.2.3


From 1a3f840a173061de97d78f98532b6f4316f41f3e Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 13:20:46 -0600
Subject: * broken

--HG--
branch : trunk
---
 CMakeLists.txt                           |  1 -
 src/server/game/Chat/Commands/Level1.cpp | 14 +++++++-------
 src/server/shared/CMakeLists.txt         |  5 +++--
 src/server/shared/Utilities/Util.cpp     |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/server/shared')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 874d695da1a..a122268a52c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-add_subdirectory(dep)
 add_subdirectory(src)
 if(DO_SQL)
     message("* Copy SQL files ON")
diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index 11189d519a0..8a739df76d8 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -20,21 +20,21 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "AccountMgr.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
-#include "CellImpl.h"
+#include "Miscellaneous/Language.h"
+#include "Grids/Cells/CellImpl.h"
 #include "InstanceSaveMgr.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 028c2185b79..e65b75c79ae 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -35,8 +35,9 @@ SET(shared_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
-  ${CMAKE_SOURCE_DIR}/dep/include/sockets
+  ${CMAKE_BINARY_DIR}/externals/SFMT
+  ${CMAKE_SOURCE_DIR}/externals/sockets/include
+  ${CMAKE_SOURCE_DIR}/externals/utf8cpp
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index a3c017fdbfd..dfeb8f62c4d 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -20,9 +20,9 @@
 
 #include "Util.h"
 
-#include "sockets/socket_include.h"
-#include "utf8cpp/utf8.h"
-#include "mersennetwister/MersenneTwister.h"
+#include "socket_include.h"
+#include "utf8.h"
+#include "SFMT.h"
 #include <ace/TSS_T.h>
 
 typedef ACE_TSS<MTRand> MTRandTSS;
-- 
cgit v1.2.3


From f1d39c2aa25d399f7a728db0592242edd7a713f9 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 13:33:31 -0600
Subject: * Fixed damn copy / paste type from my last commit. It is still very
 broken * though :P

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index e65b75c79ae..2dfe0c6ede1 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(shared_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/externals/SFMT
+  ${CMAKE_SOURCE_DIR}/externals/SFMT
   ${CMAKE_SOURCE_DIR}/externals/sockets/include
   ${CMAKE_SOURCE_DIR}/externals/utf8cpp
   ${CMAKE_SOURCE_DIR}/src/server/shared
-- 
cgit v1.2.3


From d9127cdee7142a47797a3dafa07f9d8ee0d5d9f7 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 14:13:56 -0600
Subject: * Reverted to the old Mersenne Twister till the new one can be
 properly added

--HG--
branch : trunk
---
 externals/mersennetwister/MersenneTwister.h | 405 ++++++++++++++++++++++++++++
 src/server/game/CMakeLists.txt              |   2 +-
 src/server/game/Maps/Map.h                  |   2 +-
 src/server/shared/CMakeLists.txt            |   1 +
 src/server/shared/Utilities/Util.cpp        |   3 +-
 5 files changed, 410 insertions(+), 3 deletions(-)
 create mode 100644 externals/mersennetwister/MersenneTwister.h

(limited to 'src/server/shared')

diff --git a/externals/mersennetwister/MersenneTwister.h b/externals/mersennetwister/MersenneTwister.h
new file mode 100644
index 00000000000..1cff879643f
--- /dev/null
+++ b/externals/mersennetwister/MersenneTwister.h
@@ -0,0 +1,405 @@
+// MersenneTwister.h
+// Mersenne Twister random number generator -- a C++ class MTRand
+// Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+// Richard J. Wagner  v1.0  15 May 2003  rjwagner@writeme.com
+
+// The Mersenne Twister is an algorithm for generating random numbers.  It
+// was designed with consideration of the flaws in various other generators.
+// The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
+// are far greater.  The generator is also fast; it avoids multiplication and
+// division, and it benefits from caches and pipelines.  For more information
+// see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
+
+// Reference
+// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
+// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
+// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
+
+// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+// Copyright (C) 2000 - 2003, Richard J. Wagner
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//   1. Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+//
+//   3. The names of its contributors may not be used to endorse or promote
+//      products derived from this software without specific prior written
+//      permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The original code included the following notice:
+//
+//     When you use this, send an email to: matumoto@math.keio.ac.jp
+//     with an appropriate reference to your work.
+//
+// It would be nice to CC: rjwagner@writeme.com and Cokus@math.washington.edu
+// when you write.
+
+#ifndef MERSENNETWISTER_H
+#define MERSENNETWISTER_H
+
+// Not thread safe (unless auto-initialization is avoided and each thread has
+// its own MTRand object)
+
+#include"Define.h"
+
+#include <limits.h>
+#include <time.h>
+#include <math.h>
+
+class MTRand {
+// Data
+public:
+    typedef ::uint32 uint32;
+    enum { N = 624 };       // length of state vector
+    enum { SAVE = N + 1 };  // length of array for save()
+
+protected:
+    enum { M = 397 };  // period parameter
+
+    uint32 state[N];   // internal state
+    uint32 *pNext;     // next value to get from state
+    int left;          // number of values left before reload needed
+
+//Methods
+public:
+    MTRand( const uint32& oneSeed );  // initialize with a simple uint32
+    MTRand( uint32 *const bigSeed, uint32 const seedLength = N );  // or an array
+    MTRand();                         // auto-initialize with /dev/urandom or time() and clock()
+    MTRand(const MTRand&);            // prevent copy constructor
+    MTRand& operator=(const MTRand&); // no-op operator=
+
+    // Do NOT use for CRYPTOGRAPHY without securely hashing several returned
+    // values together, otherwise the generator state can be learned after
+    // reading 624 consecutive values.
+
+    // Access to 32-bit random numbers
+    double rand();                          // real number in [0,1]
+    double rand( const double& n );         // real number in [0,n]
+    double randExc();                       // real number in [0,1)
+    double randExc( const double& n );      // real number in [0,n)
+    double randDblExc();                    // real number in (0,1)
+    double randDblExc( const double& n );   // real number in (0,n)
+    uint32 randInt();                       // integer in [0,2^32-1]
+    uint32 randInt( const uint32& n );      // integer in [0,n] for n < 2^32
+    double operator()() { return rand(); }  // same as rand()
+
+    // Access to 53-bit random numbers (capacity of IEEE double precision)
+    double rand53();  // real number in [0,1)
+
+    // Access to nonuniform random number distributions
+    double randNorm( const double& mean = 0.0, const double& variance = 0.0 );
+
+    // Re-seeding functions with same behavior as initializers
+    void seed( const uint32 oneSeed );
+    void seed( uint32 *const bigSeed, const uint32 seedLength = N );
+    void seed();
+
+    // Saving and loading generator state
+    void save( uint32* saveArray ) const;  // to array of size SAVE
+    void load( uint32 *const loadArray );  // from such array
+    /* Trinity not use streams for random values output
+    friend std::ostream& operator<<( std::ostream& os, const MTRand& mtrand );
+    friend std::istream& operator>>( std::istream& is, MTRand& mtrand );
+    */
+protected:
+    void initialize( const uint32 oneSeed );
+    void reload();
+    uint32 hiBit( const uint32& u ) const { return u & 0x80000000UL; }
+    uint32 loBit( const uint32& u ) const { return u & 0x00000001UL; }
+    uint32 loBits( const uint32& u ) const { return u & 0x7fffffffUL; }
+    uint32 mixBits( const uint32& u, const uint32& v ) const
+        { return hiBit(u) | loBits(v); }
+    uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const
+        { return m ^ (mixBits(s0,s1)>>1) ^ uint32(-(int32)(loBit(s1) & 0x9908b0dfUL)); }
+    static uint32 hash( time_t t, clock_t c );
+};
+
+inline MTRand::MTRand(const MTRand&)
+    { seed(); }
+
+inline MTRand& MTRand::operator=(const MTRand&)
+    { return *this; }
+
+inline MTRand::MTRand( const uint32& oneSeed )
+    { seed(oneSeed); }
+
+inline MTRand::MTRand( uint32 *const bigSeed, const uint32 seedLength )
+    { seed(bigSeed,seedLength); }
+
+inline MTRand::MTRand()
+    { seed(); }
+
+inline double MTRand::rand()
+    { return double(randInt()) * (1.0/4294967295.0); }
+
+inline double MTRand::rand( const double& n )
+    { return rand() * n; }
+
+inline double MTRand::randExc()
+    { return double(randInt()) * (1.0/4294967296.0); }
+
+inline double MTRand::randExc( const double& n )
+    { return randExc() * n; }
+
+inline double MTRand::randDblExc()
+    { return ( double(randInt()) + 0.5 ) * (1.0/4294967296.0); }
+
+inline double MTRand::randDblExc( const double& n )
+    { return randDblExc() * n; }
+
+inline double MTRand::rand53()
+{
+    uint32 a = randInt() >> 5, b = randInt() >> 6;
+    return ( a * 67108864.0 + b ) * (1.0/9007199254740992.0);  // by Isaku Wada
+}
+
+inline double MTRand::randNorm( const double& mean, const double& variance )
+{
+    // Return a real number from a normal (Gaussian) distribution with given
+    // mean and variance by Box-Muller method
+    double r = sqrt( -2.0 * log( 1.0-randDblExc()) ) * variance;
+    double phi = 2.0 * 3.14159265358979323846264338328 * randExc();
+    return mean + r * cos(phi);
+}
+
+inline MTRand::uint32 MTRand::randInt()
+{
+    // Pull a 32-bit integer from the generator state
+    // Every other access function simply transforms the numbers extracted here
+
+    if( left == 0 ) reload();
+    --left;
+
+    register uint32 s1;
+    s1 = *pNext++;
+    s1 ^= (s1 >> 11);
+    s1 ^= (s1 <<  7) & 0x9d2c5680UL;
+    s1 ^= (s1 << 15) & 0xefc60000UL;
+    return ( s1 ^ (s1 >> 18) );
+}
+
+inline MTRand::uint32 MTRand::randInt( const uint32& n )
+{
+    // Find which bits are used in n
+    // Optimized by Magnus Jonsson (magnus@smartelectronix.com)
+    uint32 used = n;
+    used |= used >> 1;
+    used |= used >> 2;
+    used |= used >> 4;
+    used |= used >> 8;
+    used |= used >> 16;
+
+    // Draw numbers until one is found in [0,n]
+    uint32 i;
+    do
+        i = randInt() & used;  // toss unused bits to shorten search
+    while( i > n );
+    return i;
+}
+
+inline void MTRand::seed( const uint32 oneSeed )
+{
+    // Seed the generator with a simple uint32
+    initialize(oneSeed);
+    reload();
+}
+
+inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength )
+{
+    // Seed the generator with an array of uint32's
+    // There are 2^19937-1 possible initial states.  This function allows
+    // all of those to be accessed by providing at least 19937 bits (with a
+    // default seed length of N = 624 uint32's).  Any bits above the lower 32
+    // in each element are discarded.
+    // Just call seed() if you want to get array from /dev/urandom
+    initialize(19650218UL);
+    register int i = 1;
+    register uint32 j = 0;
+    register int k = ( N > int(seedLength) ? N : int(seedLength) );
+    for (; k; --k )
+    {
+        state[i] =
+            state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL );
+        state[i] += ( bigSeed[j] & 0xffffffffUL ) + j;
+        state[i] &= 0xffffffffUL;
+        ++i;  ++j;
+        if( i >= N ) { state[0] = state[N-1];  i = 1; }
+        if( j >= seedLength ) j = 0;
+    }
+    for (k = N - 1; k; --k )
+    {
+        state[i] =
+            state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL );
+        state[i] -= i;
+        state[i] &= 0xffffffffUL;
+        ++i;
+        if( i >= N ) { state[0] = state[N-1];  i = 1; }
+    }
+    state[0] = 0x80000000UL;  // MSB is 1, assuring non-zero initial array
+    reload();
+}
+
+inline void MTRand::seed()
+{
+    // Seed the generator with hash of time() and clock() values
+    seed( hash( time(NULL), clock() ) );
+}
+
+inline void MTRand::initialize( const uint32 seed )
+{
+    // Initialize generator state with seed
+    // See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
+    // In previous versions, most significant bits (MSBs) of the seed affect
+    // only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto.
+    register uint32 *s = state;
+    register uint32 *r = state;
+    register int i = 1;
+    *s++ = seed & 0xffffffffUL;
+    for (; i < N; ++i )
+    {
+        *s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL;
+        r++;
+    }
+}
+
+inline void MTRand::reload()
+{
+    // Generate N new values in state
+    // Made clearer and faster by Matthew Bellew (matthew.bellew@home.com)
+    register uint32 *p = state;
+    register int i;
+    for (i = N - M; i--; ++p )
+        *p = twist( p[M], p[0], p[1] );
+    for (i = M; --i; ++p )
+        *p = twist( p[M-N], p[0], p[1] );
+    *p = twist( p[M-N], p[0], state[0] );
+
+    left = N, pNext = state;
+}
+
+inline MTRand::uint32 MTRand::hash( time_t t, clock_t c )
+{
+    // Get a uint32 from t and c
+    // Better than uint32(x) in case x is floating point in [0,1]
+    // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk)
+
+    static uint32 differ = 0;  // guarantee time-based seeds will change
+
+    uint32 h1 = 0;
+    unsigned char *p = (unsigned char *) &t;
+    for (size_t i = 0; i < sizeof(t); ++i )
+    {
+        h1 *= UCHAR_MAX + 2U;
+        h1 += p[i];
+    }
+    uint32 h2 = 0;
+    p = (unsigned char *) &c;
+    for (size_t j = 0; j < sizeof(c); ++j )
+    {
+        h2 *= UCHAR_MAX + 2U;
+        h2 += p[j];
+    }
+    return ( h1 + differ++ ) ^ h2;
+}
+
+inline void MTRand::save( uint32* saveArray ) const
+{
+    register uint32 *sa = saveArray;
+    register const uint32 *s = state;
+    register int i = N;
+    for (; i--; *sa++ = *s++ ) {}
+    *sa = left;
+}
+
+inline void MTRand::load( uint32 *const loadArray )
+{
+    register uint32 *s = state;
+    register uint32 *la = loadArray;
+    register int i = N;
+    for (; i--; *s++ = *la++ ) {}
+    left = *la;
+    pNext = &state[N-left];
+}
+
+/* Trinity not use streams for random values output
+inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand )
+{
+    register const MTRand::uint32 *s = mtrand.state;
+    register int i = mtrand.N;
+    for (; i--; os << *s++ << "\t" ) {}
+    return os << mtrand.left;
+}
+
+inline std::istream& operator>>( std::istream& is, MTRand& mtrand )
+{
+    register MTRand::uint32 *s = mtrand.state;
+    register int i = mtrand.N;
+    for (; i--; is >> *s++ ) {}
+    is >> mtrand.left;
+    mtrand.pNext = &mtrand.state[mtrand.N-mtrand.left];
+    return is;
+}
+*/
+
+#endif  // MERSENNETWISTER_H
+
+// Change log:
+//
+// v0.1 - First release on 15 May 2000
+//      - Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+//      - Translated from C to C++
+//      - Made completely ANSI compliant
+//      - Designed convenient interface for initialization, seeding, and
+//        obtaining numbers in default or user-defined ranges
+//      - Added automatic seeding from /dev/urandom or time() and clock()
+//      - Provided functions for saving and loading generator state
+//
+// v0.2 - Fixed bug which reloaded generator one step too late
+//
+// v0.3 - Switched to clearer, faster reload() code from Matthew Bellew
+//
+// v0.4 - Removed trailing newline in saved generator format to be consistent
+//        with output format of built-in types
+//
+// v0.5 - Improved portability by replacing static const int's with enum's and
+//        clarifying return values in seed(); suggested by Eric Heimburg
+//      - Removed MAXINT constant; use 0xffffffffUL instead
+//
+// v0.6 - Eliminated seed overflow when uint32 is larger than 32 bits
+//      - Changed integer [0,n] generator to give better uniformity
+//
+// v0.7 - Fixed operator precedence ambiguity in reload()
+//      - Added access for real numbers in (0,1) and (0,n)
+//
+// v0.8 - Included time.h header to properly support time_t and clock_t
+//
+// v1.0 - Revised seeding to match 26 Jan 2002 update of Nishimura and Matsumoto
+//      - Allowed for seeding with arrays of any length
+//      - Added access for real numbers in [0,1) with 53-bit resolution
+//      - Added access for real numbers from normal (Gaussian) distributions
+//      - Increased overall speed by optimizing twist()
+//      - Doubled speed of integer [0,n] generation
+//      - Fixed out-of-range number generation on 64-bit machines
+//      - Improved portability by substituting literal constants for long enum's
+//      - Changed license from GNU LGPL to BSD
+
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 444f181f4a9..00c9898eec8 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -317,7 +317,7 @@ SET(game_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/externals/mersennetwister
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
   ${CMAKE_SOURCE_DIR}/src/server/game
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index a0e3a2a93f8..5445401c487 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -33,7 +33,7 @@
 #include "Miscellaneous/SharedDefines.h"
 #include "Grids/GridRefManager.h"
 #include "Maps/MapRefManager.h"
-#include "mersennetwister/MersenneTwister.h"
+#include "MersenneTwister.h"
 
 #include <bitset>
 #include <list>
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 2dfe0c6ede1..933fed1c74c 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -35,6 +35,7 @@ SET(shared_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/externals/mersennetwister
   ${CMAKE_SOURCE_DIR}/externals/SFMT
   ${CMAKE_SOURCE_DIR}/externals/sockets/include
   ${CMAKE_SOURCE_DIR}/externals/utf8cpp
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index dfeb8f62c4d..14c0431c967 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -22,7 +22,8 @@
 
 #include "socket_include.h"
 #include "utf8.h"
-#include "SFMT.h"
+//#include "SFMT.h"
+#include "MersenneTwister.h"
 #include <ace/TSS_T.h>
 
 typedef ACE_TSS<MTRand> MTRandTSS;
-- 
cgit v1.2.3


From 156f4c3057d4c5aeb5a175d0490113655fb47c35 Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Mon, 7 Jun 2010 22:34:36 +0200
Subject: Merge cmake files from shared/

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt               | 94 ++++++++++++++++++++++----
 src/server/shared/Configuration/CMakeLists.txt | 22 ------
 src/server/shared/Cryptography/CMakeLists.txt  | 26 -------
 src/server/shared/Database/CMakeLists.txt      | 30 --------
 4 files changed, 81 insertions(+), 91 deletions(-)
 delete mode 100644 src/server/shared/Configuration/CMakeLists.txt
 delete mode 100644 src/server/shared/Cryptography/CMakeLists.txt
 delete mode 100644 src/server/shared/Database/CMakeLists.txt

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 933fed1c74c..3495a47f915 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,16 +1,4 @@
-add_subdirectory(Configuration)
-add_subdirectory(Cryptography)
-add_subdirectory(Database)
-add_subdirectory(DataStores)
-add_subdirectory(Debugging)
-add_subdirectory(Dynamic)
-add_subdirectory(Logging)
-add_subdirectory(Packets)
-add_subdirectory(Policies)
-add_subdirectory(Threading)
-add_subdirectory(Utilities)
-
-########### next target ###############
+########### shared ###############
 
 SET(shared_STAT_SRCS
    Debugging/Errors.h
@@ -59,3 +47,83 @@ target_link_libraries(
 shared
 ${ACE_LIBRARY}
 )
+
+
+########### trinityconfig ###############
+
+SET(trinityconfig_STAT_SRCS
+   Configuration/dotconfpp/dotconfpp.cpp
+   Configuration/dotconfpp/dotconfpp.h
+   Configuration/dotconfpp/mempool.cpp
+   Configuration/dotconfpp/mempool.h
+   Configuration/Config.cpp
+   Configuration/Config.h
+   Configuration/ConfigEnv.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+)
+
+add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
+
+########### trinityauth ###############
+
+SET(trinityauth_STAT_SRCS
+   Cryptography/Authentication/AuthCrypt.cpp
+   Cryptography/Authentication/AuthCrypt.h
+   Cryptography/BigNumber.cpp
+   Cryptography/BigNumber.h
+   Cryptography/HMACSHA1.cpp
+   Cryptography/HMACSHA1.h
+   Cryptography/SHA1.cpp
+   Cryptography/SHA1.h
+   Cryptography/MD5.c
+   Cryptography/MD5.h
+   Cryptography/ARC4.cpp
+   Cryptography/ARC4.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${MYSQL_INCLUDE_DIR}
+)
+
+add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
+
+########### trinitydatabase ###############
+
+SET(trinitydatabase_STAT_SRCS
+    DataStores/DBCFileLoader.cpp
+    DataStores/DBCFileLoader.h
+    DataStores/DBCStore.h
+    Database/Database.cpp
+    Database/Database.h
+    Database/DatabaseEnv.h
+    Database/DatabaseImpl.h
+    Database/Field.cpp
+    Database/Field.h
+    Database/QueryResult.cpp
+    Database/QueryResult.h
+    Database/SQLStorage.cpp
+    Database/SQLStorage.h
+    Database/SqlDelayThread.cpp
+    Database/SqlDelayThread.h
+    Database/SqlOperations.cpp
+    Database/SqlOperations.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${MYSQL_INCLUDE_DIR}
+)
+
+add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
\ No newline at end of file
diff --git a/src/server/shared/Configuration/CMakeLists.txt b/src/server/shared/Configuration/CMakeLists.txt
deleted file mode 100644
index da1c2e8aa3b..00000000000
--- a/src/server/shared/Configuration/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-########### next target ###############
-
-SET(trinityconfig_STAT_SRCS
-   dotconfpp/dotconfpp.cpp
-   dotconfpp/dotconfpp.h
-   dotconfpp/mempool.cpp
-   dotconfpp/mempool.h
-   Config.cpp
-   Config.h
-   ConfigEnv.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
-)
-
-add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
-
diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
deleted file mode 100644
index cdd9ece3fa0..00000000000
--- a/src/server/shared/Cryptography/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-########### next target ###############
-
-SET(trinityauth_STAT_SRCS
-   Authentication/AuthCrypt.cpp
-   Authentication/AuthCrypt.h
-   BigNumber.cpp
-   BigNumber.h
-   HMACSHA1.cpp
-   HMACSHA1.h
-   SHA1.cpp
-   SHA1.h
-   MD5.c
-   MD5.h
-   ARC4.cpp
-   ARC4.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
deleted file mode 100644
index cfe36b8c7d3..00000000000
--- a/src/server/shared/Database/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-SET(trinitydatabase_STAT_SRCS
-    ../DataStores/DBCFileLoader.cpp
-    ../DataStores/DBCFileLoader.h
-    ../DataStores/DBCStore.h
-    Database.cpp
-    Database.h
-    DatabaseEnv.h   
-    DatabaseImpl.h
-    Field.cpp
-    Field.h
-    QueryResult.cpp
-    QueryResult.h
-    SQLStorage.cpp
-    SQLStorage.h
-    SqlDelayThread.cpp
-    SqlDelayThread.h
-    SqlOperations.cpp
-    SqlOperations.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
-- 
cgit v1.2.3


From a5f4e3de948f388505b7a6d1baf107ceacfd718b Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Tue, 8 Jun 2010 01:20:06 +0200
Subject: more cmake fixes. comment collision compilation until fixed

--HG--
branch : trunk
---
 src/server/CMakeLists.txt                   |  2 +-
 src/server/authserver/CMakeLists.txt        | 13 +++++++++----
 src/server/authserver/Main.cpp              |  2 +-
 src/server/authserver/Server/AuthSocket.cpp |  4 ++--
 src/server/authserver/Server/AuthSocket.h   |  2 +-
 src/server/collision/CMakeLists.txt         |  6 +++++-
 src/server/collision/Maps/MapTree.h         |  6 +++---
 src/server/collision/Models/ModelInstance.h |  2 +-
 src/server/collision/Models/WorldModel.h    |  4 ++--
 src/server/shared/CMakeLists.txt            |  1 +
 10 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 1a6321c23e3..ccf7b894eb4 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(shared)
 add_subdirectory(game)
-add_subdirectory(collision)
+#add_subdirectory(collision)
 if (DO_SCRIPTS)
    add_subdirectory(scripts)
 endif (DO_SCRIPTS)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 496f1ff689e..98142e88729 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -18,7 +18,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/authserver
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
   ${MYSQL_INCLUDE_DIR}
 )
 
@@ -41,12 +49,9 @@ SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_
 target_link_libraries(
 trinity-realm
 shared
-trinityframework
-trinitysockets
 trinitydatabase
 trinityauth
 trinityconfig
-zlib
 ${SSLLIB}
 ${MYSQL_LIBRARIES}
 ${OSX_LIBS}
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 09bae4908e0..4d5362608a7 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -25,7 +25,7 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Log.h"
 #include "SystemConfig.h"
 #include "Util.h"
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index cc293097977..c33f84a9669 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -25,13 +25,13 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "ByteBuffer.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Log.h"
 #include "RealmList.h"
 #include "AuthSocket.h"
 #include "AuthCodes.h"
 #include <openssl/md5.h>
-#include "Auth/Sha1.h"
+#include "SHA1.h"
 //#include "Util.h" -- for commented utf8ToUpperOnlyLatin
 
 extern DatabaseType LoginDatabase;
diff --git a/src/server/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h
index bfd0fa4fdca..0ad40b6930b 100644
--- a/src/server/authserver/Server/AuthSocket.h
+++ b/src/server/authserver/Server/AuthSocket.h
@@ -26,7 +26,7 @@
 #define _AUTHSOCKET_H
 
 #include "Common.h"
-#include "Auth/BigNumber.h"
+#include "BigNumber.h"
 
 #include "RealmSocket.h"
 
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index b9d7d420d5d..a67cd8d660a 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-########### next target ###############
+########### collision ###############
 
 SET(collision_STAT_SRCS
    BoundingIntervalHierarchy.h
@@ -27,6 +27,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
 )
 
 add_library(collision STATIC ${collision_STAT_SRCS})
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 7955cb92d68..282f34d42fd 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -19,9 +19,9 @@
 #ifndef _MAPTREE_H
 #define _MAPTREE_H
 
-#include "Platform/Define.h"
-#include "Utilities/UnorderedMap.h"
-#include "BIH.h"
+#include "Define.h"
+#include "UnorderedMap.h"
+#include "BoundingIntervalHierarchy.cpp"
 
 namespace VMAP
 {
diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h
index 97b3ab632a1..42b92c8fb89 100644
--- a/src/server/collision/Models/ModelInstance.h
+++ b/src/server/collision/Models/ModelInstance.h
@@ -24,7 +24,7 @@
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace VMAP
 {
diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h
index f12efed4f5d..b23f4ae3f00 100644
--- a/src/server/collision/Models/WorldModel.h
+++ b/src/server/collision/Models/WorldModel.h
@@ -23,9 +23,9 @@
 #include <G3D/Vector3.h>
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
-#include "BIH.h"
+#include "BoundingIntervalHierarchy.cpp"
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace VMAP
 {
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 3495a47f915..6c796d60f11 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(shared_STAT_SRCS
    Logging/Log.h
    Packets/ByteBuffer.h
    Packets/WorldPacket.h
+   Policies/ObjectLifeTime.cpp
    Threading/DelayExecutor.cpp
    Threading/DelayExecutor.h
    Threading/Threading.cpp
-- 
cgit v1.2.3


From 332b0f3c8efb39d2532b965a4aed266a33f267ef Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Tue, 8 Jun 2010 08:59:38 +0200
Subject: Properly build and link core (yay!) - Not done yet : Sorting out the
 PCH-system on *nix - Not done yet : Sorting out scriptcompilation (still
 broken)

--HG--
branch : trunk
---
 CMakeLists.txt                   | 2 +-
 src/server/game/CMakeLists.txt   | 2 ++
 src/server/shared/CMakeLists.txt | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/server/shared')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7384b93cae..8f89ea5cc40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ option(CENTOS "CENTOS" 0)
 option(DO_CLI "With CLI" 1)
 option(DO_DEBUG "Debug mode" 0)
 option(DO_MYSQL "With MySQL support" 1)
-option(DO_PCH "Use precompiled headers" 1)
+option(DO_PCH "Use precompiled headers" 0)
 option(DO_RA "With RA" 0)
 option(DO_SCRIPTS "With trinityscripts" 1)
 option(DO_SQL "Copy SQL files" 0)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index bf7b5d9f1ea..15d7da2b6d8 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(game_STAT_SRCS
    AI/CreatureAIRegistry.h
    AI/CreatureAISelector.cpp
    AI/CreatureAISelector.h
+   AI/CreatureAI.cpp
+   AI/CreatureAI.h
    AuctionHouse/AuctionHouseMgr.cpp
    AuctionHouse/AuctionHouseMgr.h
    AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 6c796d60f11..010c47fd706 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -15,7 +15,9 @@ SET(shared_STAT_SRCS
    Utilities/SignalHandler.h
    Utilities/Timer.h
    Utilities/Util.cpp
-   Utilities/Util.h
+   Utilities/Util.h  
+   Utilities/EventProcessor.cpp
+   Utilities/EventProcessor.h
    Common.cpp
    Common.h
    SystemConfig.h
@@ -127,4 +129,4 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
-add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
\ No newline at end of file
+add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
-- 
cgit v1.2.3


From b76b6700edeac8f7b036e39400cbfb6bd1a22c33 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Tue, 8 Jun 2010 13:05:47 -0600
Subject: * Linux compile with and without PCH fixed * Script library compile
 fixed * --todo: fix all scripts themselves :)

--HG--
branch : trunk
---
 src/server/game/AI/CoreAI/GuardAI.cpp              |  2 +-
 src/server/game/AI/CoreAI/GuardAI.h                |  2 +-
 src/server/game/AI/CoreAI/PetAI.cpp                |  4 +-
 src/server/game/AI/CoreAI/PetAI.h                  |  2 +-
 src/server/game/AI/CoreAI/ReactorAI.cpp            |  6 +--
 src/server/game/AI/CoreAI/TotemAI.cpp              |  6 +--
 src/server/game/AI/CoreAI/TotemAI.h                |  2 +-
 src/server/game/AI/CreatureAI.h                    |  2 +-
 src/server/game/AI/CreatureAIFactory.h             |  4 +-
 src/server/game/AI/CreatureAIRegistry.cpp          | 18 ++++-----
 src/server/game/AI/CreatureAISelector.cpp          |  4 +-
 src/server/game/AI/EventAI/CreatureEventAI.cpp     |  8 ++--
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp  | 10 ++---
 src/server/game/Accounts/AccountMgr.cpp            |  8 ++--
 src/server/game/Accounts/AccountMgr.h              |  2 +-
 src/server/game/Achievements/AchievementMgr.cpp    | 20 +++++-----
 src/server/game/Achievements/AchievementMgr.h      |  4 +-
 src/server/game/Addons/AddonMgr.cpp                | 10 ++---
 src/server/game/Addons/AddonMgr.h                  |  2 +-
 .../AuctionHouseBot/AuctionHouseBot.cpp            |  2 +-
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h |  2 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   | 14 +++----
 src/server/game/AuctionHouse/AuctionHouseMgr.h     |  6 +--
 src/server/game/BattleGrounds/ArenaTeam.cpp        |  2 +-
 src/server/game/BattleGrounds/BattleGround.cpp     | 10 ++---
 src/server/game/BattleGrounds/BattleGround.h       |  4 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp  | 36 ++++++++---------
 src/server/game/BattleGrounds/BattleGroundMgr.h    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundAA.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundAB.cpp    |  6 +--
 .../game/BattleGrounds/Zones/BattleGroundAV.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundBE.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundDS.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundEY.cpp    |  6 +--
 .../game/BattleGrounds/Zones/BattleGroundEY.h      |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundIC.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundNA.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundRB.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundRL.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundRV.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundSA.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundWS.cpp    |  4 +-
 src/server/game/CMakeLists.txt                     |  4 +-
 src/server/game/Chat/Channels/Channel.h            |  4 +-
 src/server/game/Chat/Channels/ChannelMgr.cpp       |  2 +-
 src/server/game/Chat/Channels/ChannelMgr.h         |  5 +--
 src/server/game/Chat/Chat.cpp                      | 18 ++++-----
 src/server/game/Chat/Chat.h                        |  2 +-
 src/server/game/Combat/ThreatManager.h             |  6 +--
 src/server/game/DataStores/DBCStores.h             |  4 +-
 src/server/game/Entities/Corpse/Corpse.h           |  4 +-
 src/server/game/Entities/Creature/Creature.h       |  6 +--
 src/server/game/Entities/Creature/GossipDef.h      |  2 +-
 src/server/game/Entities/GameObject/GameObject.h   |  4 +-
 src/server/game/Entities/Object/Object.h           |  8 ++--
 src/server/game/Entities/Player/Player.h           | 24 ++++++------
 src/server/game/Entities/Unit/Unit.h               | 16 ++++----
 src/server/game/Events/GameEventMgr.h              |  2 +-
 src/server/game/Globals/ObjectAccessor.h           | 10 ++---
 src/server/game/Globals/ObjectMgr.h                | 12 +++---
 src/server/game/Grids/Cells/Cell.h                 |  2 +-
 src/server/game/Grids/GridDefines.h                |  2 +-
 src/server/game/Grids/NGrid.h                      |  8 ++--
 src/server/game/Grids/Notifiers/GridNotifiers.h    |  8 ++--
 .../game/Grids/Notifiers/GridNotifiersImpl.h       |  6 +--
 src/server/game/Grids/ObjectGridLoader.h           |  8 ++--
 src/server/game/Loot/LootMgr.h                     |  8 ++--
 src/server/game/Maps/Map.h                         | 12 +++---
 src/server/game/Movement/MotionMaster.h            |  2 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.cpp  |  2 +-
 src/server/game/PrecompiledHeaders/WinCorePCH.h    |  2 +-
 src/server/game/Reputation/ReputationMgr.h         |  8 ++--
 src/server/game/Server/Protocol/Opcodes.h          |  2 +-
 src/server/game/Server/WorldSession.h              |  8 ++--
 src/server/game/Spells/Spell.h                     |  4 +-
 src/server/game/Spells/SpellMgr.h                  |  6 +--
 src/server/game/World/World.h                      |  8 ++--
 src/server/scripts/CMakeLists.txt                  | 45 ++++++++++++++++++----
 src/server/scripts/Custom/on_events.cpp            |  2 +-
 .../AlteracValley/alterac_valley.cpp               |  2 +-
 .../shared/Dynamic/CountedReference/Reference.h    |  4 +-
 src/server/shared/Dynamic/TypeContainer.h          |  2 +-
 82 files changed, 278 insertions(+), 250 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index f4da814e86b..19d5b5d8354 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GuardAI.h"
-#include "Debugging/Errors.h"
+#include "Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 3d884e28906..73e3692a770 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_GUARDAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 72f0db20cb5..09ec8fae53f 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PetAI.h"
-#include "Debugging/Errors.h"
+#include "Errors.h"
 #include "Pet.h"
 #include "Player.h"
 #include "DBCStores.h"
@@ -28,7 +28,7 @@
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 int PetAI::Permissible(const Creature *creature)
 {
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index 52568999cd1..f6087a129ae 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_PETAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 class Spell;
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index f5e3739ccbf..fdca6314747 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Packets/ByteBuffer.h"
+#include "ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Debugging/Errors.h"
-#include "Logging/Log.h"
+#include "Errors.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index 58045153efd..a6464f189e8 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -25,9 +25,9 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 
 int
 TotemAI::Permissible(const Creature *creature)
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 63459ace023..34f4dfa9945 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_TOTEMAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 58020c785dd..c03d3dd09d0 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
 
-#include "AI/CoreAI/UnitAI.h"
+#include "UnitAI.h"
 #include "Common.h"
 
 class WorldObject;
diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 6aa69eaaa29..bc3b9628010 100644
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@@ -21,8 +21,8 @@
 #define TRINITY_CREATUREAIFACTORY_H
 
 //#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
-#include "Dynamic/FactoryHolder.h"
+#include "ObjectRegistry.h"
+#include "FactoryHolder.h"
 
 struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature>
 {
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 7b96e7a97d1..9db30a0a5c4 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "CoreAI/PassiveAI.h"
-#include "CoreAI/ReactorAI.h"
-#include "CoreAI/CombatAI.h"
-#include "CoreAI/GuardAI.h"
-#include "CoreAI/PetAI.h"
-#include "CoreAI/TotemAI.h"
-#include "EventAI/CreatureEventAI.h"
-#include "Movement/MovementGenerators/RandomMovementGenerator.h"
-#include "Movement/MovementGeneratorImpl.h"
+#include "PassiveAI.h"
+#include "ReactorAI.h"
+#include "CombatAI.h"
+#include "GuardAI.h"
+#include "PetAI.h"
+#include "TotemAI.h"
+#include "CreatureEventAI.h"
+#include "RandomMovementGenerator.h"
+#include "MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 6985edaaf2b..79977fab5b1 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -20,8 +20,8 @@
 
 #include "Creature.h"
 #include "CreatureAISelector.h"
-#include "AI/CoreAI/PassiveAI.h"
-#include "Policies/SingletonImp.h"
+#include "PassiveAI.h"
+#include "SingletonImp.h"
 #include "MovementGenerator.h"
 #include "Pet.h"
 #include "TemporarySummon.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 4162a002d99..47c8e9e6ad8 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -24,11 +24,11 @@
 #include "ObjectMgr.h"
 #include "Spell.h"
 #include "World.h"
-#include "Grids/Cells/Cell.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Cell.h"
+#include "CellImpl.h"
 #include "GameEventMgr.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index f24226ee913..57c23c9a26b 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -17,15 +17,15 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "ProgressBar.h"
+#include "SingletonImp.h"
 #include "ObjectDefines.h"
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 8089b4d624d..18372677120 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -18,14 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Utilities/Util.h"
-#include "Cryptography/SHA1.h"
+#include "Util.h"
+#include "SHA1.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index b017bf1836a..f770e24d902 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 enum AccountOpResult
 {
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 9f449105005..e30f6ed35df 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -20,24 +20,24 @@
 #include "DBCEnums.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Events/GameEventMgr.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Guilds/Guild.h"
-#include "Miscellaneous/Language.h"
+#include "CellImpl.h"
+#include "GameEventMgr.h"
+#include "GridNotifiersImpl.h"
+#include "Guild.h"
+#include "Language.h"
 #include "Player.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include "SpellMgr.h"
 
 #include "MapManager.h"
 #include "BattleGround.h"
-#include "BattleGrounds/Zones/BattleGroundAB.h"
+#include "BattleGroundAB.h"
 #include "Map.h"
 #include "InstanceData.h"
 
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index ea9e5e95142..6e27a3da068 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -22,8 +22,8 @@
 #include <string>
 
 #include "Common.h"
-#include "Policies/Singleton.h"
-#include "Database/DatabaseEnv.h"
+#include "Singleton.h"
+#include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
 
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index b87ddd023f7..b7b1d2e9333 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Utilities/Util.h"
-#include "Cryptography/SHA1.h"
-#include "Utilities/ProgressBar.h"
+#include "Util.h"
+#include "SHA1.h"
+#include "ProgressBar.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 8f5eed4918f..0d648794416 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -22,7 +22,7 @@
 #define _ADDONMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include <string>
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
index ebbf48e6476..e9cf8f21ab2 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
@@ -3,7 +3,7 @@
 #include "AuctionHouseBot.h"
 #include <vector>
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 INSTANTIATE_SINGLETON_1(AuctionHouseBot);
 
 using namespace std;
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index 08e93fca232..f29a8762513 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -2,7 +2,7 @@
 #define AUCTION_HOUSE_BOT_H
 
 #include "World.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 #include "ItemPrototype.h"
 
 #define AHB_GREY        0
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 5f00d36ba45..744df2cb6e7 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -20,19 +20,19 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
+#include "SingletonImp.h"
 #include "DBCStores.h"
 
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Logging/Log.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include <vector>
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 2c29986f87a..7048e419c36 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -21,11 +21,11 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 
-#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
+#include "AuctionHouseBot.h"
 
 class Item;
 class Player;
diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp
index b5fe5c16dfe..4224ff6357a 100644
--- a/src/server/game/BattleGrounds/ArenaTeam.cpp
+++ b/src/server/game/BattleGrounds/ArenaTeam.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "World.h"
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index ed8ad8b62a8..591417c8fea 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -21,21 +21,21 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "Miscellaneous/Formulas.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Formulas.h"
+#include "GridNotifiersImpl.h"
 #include "Group.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "MapManager.h"
 #include "Object.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 namespace Trinity
 {
diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h
index 36fdb18f1bc..6f46b6f8f6d 100644
--- a/src/server/game/BattleGrounds/BattleGround.h
+++ b/src/server/game/BattleGrounds/BattleGround.h
@@ -22,8 +22,8 @@
 #define __BATTLEGROUND_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "DataStores/DBCEnums.h"
+#include "SharedDefines.h"
+#include "DBCEnums.h"
 
 class Creature;
 class GameObject;
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index faf8b517f15..ea2d0c2f920 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -21,33 +21,33 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "SingletonImp.h"
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
-#include "Zones/BattleGroundAV.h"
-#include "Zones/BattleGroundAB.h"
-#include "Zones/BattleGroundEY.h"
-#include "Zones/BattleGroundWS.h"
-#include "Zones/BattleGroundNA.h"
-#include "Zones/BattleGroundBE.h"
-#include "Zones/BattleGroundAA.h"
-#include "Zones/BattleGroundRL.h"
-#include "Zones/BattleGroundSA.h"
-#include "Zones/BattleGroundDS.h"
-#include "Zones/BattleGroundRV.h"
-#include "Zones/BattleGroundIC.h"
-#include "Zones/BattleGroundRB.h"
+#include "BattleGroundAV.h"
+#include "BattleGroundAB.h"
+#include "BattleGroundEY.h"
+#include "BattleGroundWS.h"
+#include "BattleGroundNA.h"
+#include "BattleGroundBE.h"
+#include "BattleGroundAA.h"
+#include "BattleGroundRL.h"
+#include "BattleGroundSA.h"
+#include "BattleGroundDS.h"
+#include "BattleGroundRV.h"
+#include "BattleGroundIC.h"
+#include "BattleGroundRB.h"
 #include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
 #include "Player.h"
 #include "GameEventMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Miscellaneous/Formulas.h"
+#include "ProgressBar.h"
+#include "SharedDefines.h"
+#include "Formulas.h"
 
 INSTANTIATE_SINGLETON_1(BattleGroundMgr);
 
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h
index 569651a95b3..5319ce85752 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.h
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.h
@@ -22,7 +22,7 @@
 #define __BATTLEGROUNDMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include "DBCEnums.h"
 #include "BattleGround.h"
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
index 9b2dd152c5e..56cf3ebed15 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
@@ -20,7 +20,7 @@
 
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
index 549b844cd20..38671e85597 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
@@ -19,16 +19,16 @@
  */
 
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
index 32334840f51..b477d6723fe 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
index e5199115bcd..d6debe45ae3 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
index 8a4ca9fb497..9036ef83f93 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
index a81a54f6b98..20f023e4c2a 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
@@ -20,15 +20,15 @@
 
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index d4bd89552be..4fe23c4c821 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -21,7 +21,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 class BattleGround;
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
index 8e759046f47..8dbcc81e5c6 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
@@ -19,7 +19,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
index 09f8fef44de..793cf13b3cb 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
index 2777268a33c..cf22154ed11 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
@@ -21,7 +21,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
index 94374ace289..ef2ec3cfa94 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
index 32e578ae5ed..fcc53dbbcf9 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
@@ -21,9 +21,9 @@
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "GameObject.h"
 
 BattleGroundRV::BattleGroundRV()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
index f67ad9b3300..ccde43ce948 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 
 BattleGroundSA::BattleGroundSA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 2eb94ca9958..71872511274 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -22,13 +22,13 @@
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 15d7da2b6d8..480f342aaa8 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -362,6 +362,7 @@ include_directories(
   ${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
@@ -393,6 +394,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
   ${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
@@ -406,8 +408,6 @@ include_directories(
 
 if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
-      PrecompiledHeaders/ScriptPCH.cpp
-      PrecompiledHeaders/ScriptPCH.h
       AI/ScriptedAI/ScriptedEscortAI.cpp
       AI/ScriptedAI/ScriptedEscortAI.h
       AI/ScriptedAI/ScriptedCreature.cpp
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index cafa814e1c9..d0b5923e30e 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -27,9 +27,9 @@
 
 #include "Common.h"
 
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 enum ChatNotify
 {
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index f31d3ffde50..b26a42aa2b1 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "World.h"
 
 INSTANTIATE_SINGLETON_1(AllianceChannelMgr);
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 6f3b7c415ae..1997eb76108 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -22,14 +22,11 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include <map>
 #include <string>
 
-#include "Policies/Singleton.h"
-
-#include "Channel.h"
 #include "World.h"
 
 class ChannelMgr
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 66d867e4a69..10fec8fbe4f 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -21,19 +21,19 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "DatabaseEnv.h"
 
 #include "AccountMgr.h"
-#include "Grids/Cells/CellImpl.h"
+#include "CellImpl.h"
 #include "Chat.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Miscellaneous/Language.h"
-#include "Logging/Log.h"
-#include "Server/Protocol/Opcodes.h"
+#include "GridNotifiersImpl.h"
+#include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
 #include "Player.h"
-#include "Entities/Object/Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "SpellMgr.h"
 
 // Supported shift-links (client generated and server side)
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 8da2979ae82..a298ca03881 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 
 class ChatHandler;
 class WorldSession;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 517f4548121..f0ae370907b 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -22,9 +22,9 @@
 #define _THREATMANAGER
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Dynamic/LinkedReference/Reference.h"
-#include "Combat/UnitEvents.h"
+#include "SharedDefines.h"
+#include "Reference.h"
+#include "UnitEvents.h"
 
 #include <list>
 
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index f4404bce447..1bda56f38cc 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -20,8 +20,8 @@
 #define TRINITY_DBCSTORES_H
 
 #include "Common.h"
-#include "DataStores/DBCStore.h"
-#include "DataStores/DBCStructure.h"
+#include "DBCStore.h"
+#include "DBCStructure.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index 17c8e597d87..3ba00cec3b1 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -22,8 +22,8 @@
 #define TRINITYCORE_CORPSE_H
 
 #include "Object.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/GridDefines.h"
+#include "DatabaseEnv.h"
+#include "GridDefines.h"
 #include "LootMgr.h"
 
 enum CorpseType
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 0d4a4b0930e..c19187f2770 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -23,11 +23,11 @@
 
 #include "Common.h"
 #include "Unit.h"
-#include "Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "ItemPrototype.h"
 #include "LootMgr.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/Cells/Cell.h"
+#include "DatabaseEnv.h"
+#include "Cell.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index 42ca4cc4ab3..ce2049cc23f 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "QuestDef.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "NPCHandler.h"
 
 class WorldSession;
 
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index be760e9bf41..db7f74cb412 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -22,10 +22,10 @@
 #define TRINITYCORE_GAMEOBJECT_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined(__GNUC__)
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index edeac0a20ef..ad7d0c072ab 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -22,11 +22,11 @@
 #define _OBJECT_H
 
 #include "Common.h"
-#include "Updates/UpdateFields.h"
-#include "Updates/UpdateData.h"
-#include "Grids/GridReference.h"
+#include "UpdateFields.h"
+#include "UpdateData.h"
+#include "GridReference.h"
 #include "ObjectDefines.h"
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "Map.h"
 
 #include <set>
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 983d10f5e02..3bff9808e9d 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -26,20 +26,20 @@
 #include "Unit.h"
 #include "Item.h"
 
-#include "Database/DatabaseEnv.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
-#include "Quests/QuestDef.h"
-#include "Groups/Group.h"
-#include "Item/Container/Bag.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "NPCHandler.h"
+#include "QuestDef.h"
+#include "Group.h"
+#include "Bag.h"
+#include "WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
-#include "Utilities/Util.h"                                           // for Tokens typedef
-#include "Achievements/AchievementMgr.h"
-#include "Reputation/ReputationMgr.h"
-#include "BattleGrounds/BattleGround.h"
-#include "DataStores/DBCEnums.h"
-#include "DungeonFinding/LFG.h"
+#include "Util.h"                                           // for Tokens typedef
+#include "AchievementMgr.h"
+#include "ReputationMgr.h"
+#include "BattleGround.h"
+#include "DBCEnums.h"
+#include "LFG.h"
 
 #include<string>
 #include<vector>
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index dc90411d88b..7091ae22bd3 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -23,15 +23,15 @@
 
 #include "Common.h"
 #include "Object.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "SpellAuraDefines.h"
-#include "Updates/UpdateFields.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Combat/ThreatManager.h"
-#include "Combat/HostileRefManager.h"
-#include "Movement/FollowerReference.h"
-#include "Movement/FollowerRefManager.h"
-#include "Utilities/EventProcessor.h"
+#include "UpdateFields.h"
+#include "SharedDefines.h"
+#include "ThreatManager.h"
+#include "HostileRefManager.h"
+#include "FollowerReference.h"
+#include "FollowerRefManager.h"
+#include "EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
 #include <list>
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 2ad8fd3de59..d0e288fd77e 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -22,7 +22,7 @@
 #define TRINITY_GAMEEVENT_MGR_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Define.h"
 #include "Policies/Singleton.h"
 
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index 1f865229d42..e3295428505 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -22,14 +22,14 @@
 #define TRINITY_OBJECTACCESSOR_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include <ace/Thread_Mutex.h>
-#include "Dynamic/UnorderedMap.h"
-#include "Policies/ThreadingModel.h"
+#include "UnorderedMap.h"
+#include "ThreadingModel.h"
 
-#include "Updates/UpdateData.h"
+#include "UpdateData.h"
 
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "Object.h"
 #include "Player.h"
 
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index d8a0f81c698..79b6ffdd0eb 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -21,18 +21,18 @@
 #ifndef _OBJECTMGR_H
 #define _OBJECTMGR_H
 
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Object.h"
-#include "Entities/Item/Container/Bag.h"
+#include "Bag.h"
 #include "Creature.h"
 #include "Player.h"
-#include "Entities/DynamicObject/DynamicObject.h"
+#include "DynamicObject.h"
 #include "GameObject.h"
-#include "Entities/Corpse/Corpse.h"
+#include "Corpse.h"
 #include "QuestDef.h"
-#include "Movement/Waypoints/Path.h"
+#include "Path.h"
 #include "ItemPrototype.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "NPCHandler.h"
 #include "Database/DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 657cc403e2a..4cc1e0864ba 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -26,7 +26,7 @@
 #include "Dynamic/TypeContainer.h"
 #include "Dynamic/TypeContainerVisitor.h"
 
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 
 class Map;
 class WorldObject;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index e27ebec4a46..e59bb6aa8a0 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -22,7 +22,7 @@
 #define TRINITY_GRIDDEFINES_H
 
 #include "Common.h"
-#include "Grids/NGrid.h"
+#include "NGrid.h"
 #include <cmath>
 
 // Forward class definitions
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 1d8967e4d9a..8c539519211 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,10 +24,10 @@
 /** NGrid is nothing more than a wrapper of the Grid with an NxN cells
  */
 
-#include "Grids/Grid.h"
-#include "Grids/GridReference.h"
-#include "Utilities/Timer.h"
-#include "Utilities/Util.h"
+#include "Grid.h"
+#include "GridReference.h"
+#include "Timer.h"
+#include "Util.h"
 
 #define DEFAULT_VISIBILITY_NOTIFY_PERIOD      1000
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index 9cbcb078128..b0abf0aae79 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -21,13 +21,13 @@
 #ifndef TRINITY_GRIDNOTIFIERS_H
 #define TRINITY_GRIDNOTIFIERS_H
 
-#include "Grids/ObjectGridLoader.h"
-#include "Updates/UpdateData.h"
+#include "ObjectGridLoader.h"
+#include "UpdateData.h"
 #include <iostream>
 
-#include "Entities/Corpse/Corpse.h"
+#include "Corpse.h"
 #include "Object.h"
-#include "Entities/DynamicObject/DynamicObject.h"
+#include "DynamicObject.h"
 #include "GameObject.h"
 #include "Player.h"
 #include "Unit.h"
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 43cb94540c3..26a9c0bd328 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -22,10 +22,10 @@
 #define TRINITY_GRIDNOTIFIERSIMPL_H
 
 #include "GridNotifiers.h"
-#include "Packets/WorldPacket.h"
-#include "Corpse/Corpse.h"
+#include "WorldPacket.h"
+#include "Corpse.h"
 #include "Player.h"
-#include "Updates/UpdateData.h"
+#include "UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index 90e3383fbc8..c1a59cb4ecb 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -21,11 +21,11 @@
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
 
-#include "Dynamic/TypeList.h"
+#include "TypeList.h"
 #include "Define.h"
-#include "Grids/GridLoader.h"
-#include "Grids/GridDefines.h"
-#include "Grids/Cells/Cell.h"
+#include "GridLoader.h"
+#include "GridDefines.h"
+#include "Cell.h"
 
 class ObjectWorldLoader;
 
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 55bb35eda6f..00fe2a97888 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -22,10 +22,10 @@
 #define TRINITY_LOOTMGR_H
 
 #include "ItemEnchantmentMgr.h"
-#include "Packets/ByteBuffer.h"
-#include "Dynamic/LinkedReference/RefManager.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Conditions/ConditionMgr.h"
+#include "ByteBuffer.h"
+#include "RefManager.h"
+#include "SharedDefines.h"
+#include "ConditionMgr.h"
 
 #include <map>
 #include <vector>
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 5445401c487..52c79be7038 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -27,12 +27,12 @@
 #include "ace/Thread_Mutex.h"
 
 #include "DBCStructure.h"
-#include "Grids/GridDefines.h"
-#include "Grids/Cells/Cell.h"
-#include "Utilities/Timer.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Grids/GridRefManager.h"
-#include "Maps/MapRefManager.h"
+#include "GridDefines.h"
+#include "Cell.h"
+#include "Timer.h"
+#include "SharedDefines.h"
+#include "GridRefManager.h"
+#include "MapRefManager.h"
 #include "MersenneTwister.h"
 
 #include <bitset>
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 5bd81cd965c..c4082ba086a 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include <vector>
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Object.h"
 
 class MovementGenerator;
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
index e588392689e..e3b0613cafd 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
@@ -1 +1 @@
-#include "pchdef.h"
\ No newline at end of file
+#include "NixCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index cd1ea4a418a..0757b07438d 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -11,4 +11,4 @@
 #include "SharedDefines.h"
 #include "ObjectMgr.h"
 
-#include "ScriptedPch.h"
\ No newline at end of file
+#include "ScriptPCH.h"
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 9fc0efdf850..4c0fd778a4d 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -20,10 +20,10 @@
 #define __TRINITY_REPUTATION_MGR_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Miscellaneous/Language.h"
-#include "DataStores/DBCStructure.h"
-#include "Database/QueryResult.h"
+#include "SharedDefines.h"
+#include "Language.h"
+#include "DBCStructure.h"
+#include "QueryResult.h"
 #include <map>
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 67f2026f1f5..4ae6931c3f5 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -31,7 +31,7 @@
 //       if this class definition not complite then VS for x64 release use different size for
 //       struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
 //       table opcodeTable in source when Opcode.h included but WorldSession.h not included
-#include "Server/WorldSession.h"
+#include "WorldSession.h"
 
 /// List of Opcodes
 enum Opcodes
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index d2e8f6cdada..c17f3e3f3e6 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -26,10 +26,10 @@
 #define __WORLDSESSION_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Addons/AddonMgr.h"
-#include "Database/QueryResult.h"
-#include "World/World.h"
+#include "SharedDefines.h"
+#include "AddonMgr.h"
+#include "QueryResult.h"
+#include "World.h"
 
 struct ItemPrototype;
 struct AuctionEntry;
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index ef21e4a14b3..a987e35e65d 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -21,8 +21,8 @@
 #ifndef __SPELL_H
 #define __SPELL_H
 
-#include "Grids/GridDefines.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "GridDefines.h"
+#include "SharedDefines.h"
 
 class Unit;
 class Player;
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index b6768348417..ad0bad7cfaa 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -24,13 +24,13 @@
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 
-#include "Dynamic/UnorderedMap.h"
+#include "UnorderedMap.h"
 
 #include "Player.h"
 
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index dfd13e60d46..c53cab1124f 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -26,11 +26,11 @@
 #define __WORLD_H
 
 #include "Common.h"
-#include "Utilities/Timer.h"
-#include "Policies/Singleton.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "Timer.h"
+#include "Singleton.h"
+#include "SharedDefines.h"
 #include "ace/Atomic_Op.h"
-#include "Database/QueryResult.h"
+#include "QueryResult.h"
 
 #include <map>
 #include <set>
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 6e757b95243..3712904335d 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -582,48 +582,79 @@ message("-- Added Script Engine to SCRIPTS lib")
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/externals/mersennetwister
+  ${CMAKE_SOURCE_DIR}/externals/zlib
+  ${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/Database
+  ${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/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
   ${CMAKE_SOURCE_DIR}/src/server/game/Account
   ${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/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/BattleGrounds
   ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
   ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/game/Combat
   ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
   ${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/Unit
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
   ${CMAKE_SOURCE_DIR}/src/server/game/Events
   ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
   ${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/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
   ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
   ${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
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers
   ${CMAKE_SOURCE_DIR}/src/server/game/Skills
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
diff --git a/src/server/scripts/Custom/on_events.cpp b/src/server/scripts/Custom/on_events.cpp
index 94e54a07fba..904f0010d55 100644
--- a/src/server/scripts/Custom/on_events.cpp
+++ b/src/server/scripts/Custom/on_events.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include <cstring>
 
 //This function is called when the player logs in (every login)
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index a61fc21d5ba..e1788f0290b 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h
index d3cfe55ffc0..bdc06a572c9 100644
--- a/src/server/shared/Dynamic/CountedReference/Reference.h
+++ b/src/server/shared/Dynamic/CountedReference/Reference.h
@@ -33,8 +33,8 @@
  */
 
 #include <stdexcept>
-#include "Platform/Define.h"
-#include "Policies/ThreadingModel.h"
+#include "Define.h"
+#include "ThreadingModel.h"
 #include "ReferenceHolder.h"
 
 template
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
index 0fa61f5e562..4ed07431ee3 100644
--- a/src/server/shared/Dynamic/TypeContainer.h
+++ b/src/server/shared/Dynamic/TypeContainer.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include "Define.h"
 #include "Dynamic/TypeList.h"
-#include "Grids/GridRefManager.h"
+#include "GridRefManager.h"
 
 /*
  * @class ContainerMapList is a mulit-type container for map elements
-- 
cgit v1.2.3


From 4cdb5c78f2cacfd5a26813a73eb59ec6c65231c0 Mon Sep 17 00:00:00 2001
From: Rat <none@none>
Date: Wed, 9 Jun 2010 14:05:50 +0200
Subject: added revision.h O.o game.vcproj update , game.lib now buildable
 todo: auth+world server

--HG--
branch : trunk
---
 src/server/game/PrecompiledHeaders/WinCorePCH.h | 22 ++++++-------
 src/server/shared/revision.h                    | 12 +++++++
 win/TrinityCore&Script VC90.sln                 |  3 --
 win/VC90/game.vcproj                            | 44 +++++++++++--------------
 4 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 src/server/shared/revision.h

(limited to 'src/server/shared')

diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index 09b5de6d67f..e94a664b155 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -1,14 +1,14 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "Common.h"
+#include "..\Server\WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "..\..\shared\Common.h"
 
-#include "MapManager.h"
-#include "Log.h"
-#include "ObjectAccessor.h"
-#include "ObjectDefines.h"
-#include "SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
-#include "ObjectMgr.h"
+#include "..\Maps\MapManager.h"
+#include "..\..\shared\Logging\Log.h"
+#include "..\Globals\ObjectAccessor.h"
+#include "..\Entities\Object\ObjectDefines.h"
+#include "..\..\shared\Database/SQLStorage.h"
+#include "..\Protocol\Opcodes.h"
+#include "..\Miscellaneous\SharedDefines.h"
+#include "..\Globals\ObjectMgr.h"
 
-#include "ScriptPCH.h"
+#include "ScriptPCH.h"
\ No newline at end of file
diff --git a/src/server/shared/revision.h b/src/server/shared/revision.h
new file mode 100644
index 00000000000..f459116dc84
--- /dev/null
+++ b/src/server/shared/revision.h
@@ -0,0 +1,12 @@
+#ifndef __REVISION_H__
+#define __REVISION_H__
+ #define _BUILD_DIRECTIVE "Debug"
+ #define _REVISION "8417"
+ #define _HASH "47972987739a"
+ #define _REVISION_DATE "*"
+ #define _REVISION_TIME "*"
+ #define FILEVER        0,0,8417,0
+ #define PRODUCTVER     0,0,8417,0
+ #define STRFILEVER     "0, 0, 8417, 47972987739a"
+ #define STRPRODUCTVER  "0, 0, 8417, 47972987739a"
+#endif // __REVISION_H__
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln
index f0734c9ae6c..17a19a5a8e1 100644
--- a/win/TrinityCore&Script VC90.sln	
+++ b/win/TrinityCore&Script VC90.sln	
@@ -1,9 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC90\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
 EndProject
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index a993c0c36a9..b45bbe02967 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -6,7 +6,7 @@
 	ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
 	RootNamespace="game"
 	Keyword="Win32Proj"
-	AssemblyReferenceSearchPaths="&quot;..\..\src\game&quot;"
+	AssemblyReferenceSearchPaths="&quot;..\..\src\server\game&quot;"
 	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;"
+				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -56,7 +56,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
 				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
@@ -68,7 +68,7 @@
 				DebugInformationFormat="3"
 				CallingConvention="0"
 				CompileAs="0"
-				ForcedIncludeFiles=""
+				ForcedIncludeFiles="WinCorePCH.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -2377,10 +2377,6 @@
 						RelativePath="..\..\src\server\scripts\Northrend\Naxxramas\boss_heigan.cpp"
 						>
 					</File>
-					<File
-						RelativePath="..\..\src\server\scripts\Northrend\Naxxramas\boss_highlord_mograine.cpp"
-						>
-					</File>
 					<File
 						RelativePath="..\..\src\server\scripts\Northrend\Naxxramas\boss_kelthuzad.cpp"
 						>
@@ -4311,14 +4307,6 @@
 				RelativePath="..\..\src\server\game\PrecompiledHeaders\ScriptPCH.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\server\game\PrecompiledHeaders\WinCorePCH.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\server\game\PrecompiledHeaders\WinCorePCH.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Quests"
@@ -4447,14 +4435,6 @@
 		<Filter
 			Name="World"
 			>
-			<File
-				RelativePath="..\..\src\server\game\World\TimeMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\server\game\World\TimeMgr.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\server\game\World\World.cpp"
 				>
@@ -4552,6 +4532,22 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath="..\..\src\server\game\PrecompiledHeaders\WinCorePCH.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\server\game\PrecompiledHeaders\WinCorePCH.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
-- 
cgit v1.2.3


From dd5583e96273476607a63f197309e460d84a09cb Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Wed, 9 Jun 2010 07:02:24 -0600
Subject: * Removed static revision.h from src/server/shared * This is a
 dynamically generated file

--HG--
branch : trunk
---
 src/server/shared/revision.h | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 src/server/shared/revision.h

(limited to 'src/server/shared')

diff --git a/src/server/shared/revision.h b/src/server/shared/revision.h
deleted file mode 100644
index f459116dc84..00000000000
--- a/src/server/shared/revision.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __REVISION_H__
-#define __REVISION_H__
- #define _BUILD_DIRECTIVE "Debug"
- #define _REVISION "8417"
- #define _HASH "47972987739a"
- #define _REVISION_DATE "*"
- #define _REVISION_TIME "*"
- #define FILEVER        0,0,8417,0
- #define PRODUCTVER     0,0,8417,0
- #define STRFILEVER     "0, 0, 8417, 47972987739a"
- #define STRPRODUCTVER  "0, 0, 8417, 47972987739a"
-#endif // __REVISION_H__
-- 
cgit v1.2.3


From 2457c5a174e145b0812479c63bf56f3cdd03a79d Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Wed, 9 Jun 2010 15:39:34 +0200
Subject: Add copyright notes to CMake files

--HG--
branch : trunk
---
 CMakeLists.txt                           | 10 ++++++++++
 src/CMakeLists.txt                       | 10 ++++++++++
 src/server/CMakeLists.txt                | 10 ++++++++++
 src/server/authserver/CMakeLists.txt     | 12 +++++++++++-
 src/server/collision/CMakeLists.txt      |  9 +++++++++
 src/server/game/CMakeLists.txt           | 12 ++++++++++++
 src/server/scripts/CMakeLists.txt        | 12 ++++++++++++
 src/server/shared/CMakeLists.txt         | 10 ++++++++++
 src/server/worldserver/CMakeLists.txt    | 11 ++++++++++-
 src/tools/CMakeLists.txt                 | 10 ++++++++++
 src/tools/vmap3_assembler/CMakeLists.txt |  2 +-
 11 files changed, 105 insertions(+), 3 deletions(-)

(limited to 'src/server/shared')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb6a9c512b..4c143280e0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-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.
+
 project(Trinity)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0005 OLD)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 205a3961677..76c3de027eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-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.
+
 add_subdirectory(server)
 
 if(DO_TOOLS)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index d975ef8f4c4..cf835f7ca66 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-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.
+
 if(DO_WORLDSERVER)
   add_subdirectory(shared)
   add_subdirectory(game)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 5d753a565c0..394841939c0 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,4 +1,14 @@
-########### next target ###############
+# Copyright (C) 2005-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.
+
+########### authserver ###############
 
 SET(authserver_SRCS
 Authentication/AuthCodes.cpp
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index a058c14378b..1090b7ab0f7 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,3 +1,12 @@
+# Copyright (C) 2005-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.
 
 ########### collision ###############
 
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 8ae179a3772..8616c730d18 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,3 +1,15 @@
+# Copyright (C) 2005-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.
+
+######## game ########
+
 # Enable precompiled headers when using the GCC compiler.
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
         INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index bd7ba5d5af9..28a137fe4d3 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,3 +1,15 @@
+# Copyright (C) 2005-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.
+
+####### scripts ########
+
 # Enable precompiled headers when using the GCC compiler.
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 010c47fd706..6ff39c724de 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-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.
+
 ########### shared ###############
 
 SET(shared_STAT_SRCS
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3203d1dfa2b..3cce53f1e3f 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,5 +1,14 @@
+# Copyright (C) 2005-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(worldserver_SRCS
 CommandLine/CliRunnable.cpp
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 1d891d39182..f960329674f 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-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.
+
 add_subdirectory(map_extractor)
 add_subdirectory(vmap3_assembler)
 add_subdirectory(vmap3_extractor)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 29d24eaa9e2..2088158af6a 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2005-2009 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2005-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
-- 
cgit v1.2.3


From 7195abfad019ac22c86819ac2b651a2ac6c11dd8 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Thu, 10 Jun 2010 16:39:51 +0200
Subject: Fixed TrinityRealm compile on windows Fixed shared build on windows
 fully

NOTE: TrinityRealm config file has been renamed to authserver.conf!

--HG--
branch : trunk
---
 src/server/authserver/Main.cpp               |  2 +-
 src/server/authserver/Server/RealmSocket.h   |  2 +-
 src/server/shared/Utilities/ServiceWin32.cpp |  5 ++++
 win/VC90/TrinityRealm.vcproj                 | 24 ++++++++--------
 win/VC90/shared.vcproj                       | 42 ++++++++++++++++++++++++----
 5 files changed, 55 insertions(+), 20 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 4d5362608a7..7dbb1c95b5b 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -42,7 +42,7 @@
 #include <openssl/crypto.h>
 
 #ifndef _TRINITY_REALM_CONFIG
-# define _TRINITY_REALM_CONFIG  "TrinityRealm.conf"
+# define _TRINITY_REALM_CONFIG  "authserver.conf"
 #endif //_TRINITY_REALM_CONFIG
 
 #ifdef WIN32
diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
index dd9d4c68d26..8749fba9def 100644
--- a/src/server/authserver/Server/RealmSocket.h
+++ b/src/server/authserver/Server/RealmSocket.h
@@ -25,11 +25,11 @@
 #ifndef __REALMSOCKET_H__
 #define __REALMSOCKET_H__
 
-#include <ace/Basic_Types.h>
 #include <ace/Synch_Traits.h>
 #include <ace/Svc_Handler.h>
 #include <ace/SOCK_Stream.h>
 #include <ace/Message_Block.h>
+#include <ace/Basic_Types.h>
 
 class RealmSocket : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index 2c1df2ff483..513dd64b505 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -26,6 +26,11 @@
 #include <windows.h>
 #include <winsvc.h>
 
+// stupid ACE define
+#ifdef main
+#undef main
+#endif //main
+
 #if !defined(WINADVAPI)
 #if !defined(_ADVAPI32_)
 #define WINADVAPI DECLSPEC_IMPORT
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index 746157e46e8..1b8b18aabbe 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;..\..\src\server\shared"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
 				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf"
 			/>
 		</Configuration>
 		<Configuration
@@ -146,7 +146,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;..\..\src\server\shared"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
 				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf"
 			/>
 		</Configuration>
 		<Configuration
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\Database;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
 				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -311,7 +311,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf"
 			/>
 		</Configuration>
 		<Configuration
@@ -344,7 +344,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\Database;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
 				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
@@ -410,7 +410,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf"
 			/>
 		</Configuration>
 	</Configurations>
@@ -425,6 +425,10 @@
 			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\authserver.rc"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\server\authserver\Server\AuthSocket.cpp"
 			>
@@ -457,10 +461,6 @@
 			RelativePath="..\..\src\server\authserver\Server\RealmSocket.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\TrinityRealm.rc"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.cpp"
 			>
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index c8cbd43e2fd..a84fb4cde2f 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -129,7 +129,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -210,7 +210,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -293,7 +293,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -727,7 +727,7 @@
 					Name="VCCustomBuildTool"
 					Description="Getting Version..."
 					CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
 					Outputs="revision.h"
 				/>
 			</FileConfiguration>
@@ -738,10 +738,40 @@
 					Name="VCCustomBuildTool"
 					Description="Getting Version..."
 					CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;-d&quot; &quot;..\..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
 					Outputs="revision.h"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|x64"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Getting Version..."
+					CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..\..&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
+					Outputs="revision.h"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|x64"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Getting Version..."
+					CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;-d&quot; &quot;..\..\..&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
+					Outputs="revision.h"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Utilities\ServiceWin32.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Utilities\ServiceWin32.h"
+			>
 		</File>
 		<File
 			RelativePath="..\..\src\server\shared\SystemConfig.h"
-- 
cgit v1.2.3


From 43f527b94fcf8a31dc4d57110a24323a1befe111 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Mon, 14 Jun 2010 02:43:18 +0200
Subject: Fix compile-errors on older versions of GCC (missing definitions -
 thanks to lynx3d for the heads up) (users are adviced to upgrade to a MORE
 RECENT version of GCC that supports the standardized tr1::unordered_map
 functionality though)

--HG--
branch : trunk
---
 src/server/shared/Dynamic/UnorderedMap.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h
index fa87411258d..d9f41fe4ab8 100644
--- a/src/server/shared/Dynamic/UnorderedMap.h
+++ b/src/server/shared/Dynamic/UnorderedMap.h
@@ -62,7 +62,13 @@ namespace __gnu_cxx
     {
         size_t operator()(T * const &__x) const { return (size_t)__x; }
     };
-
+    template<> struct hash<std::string>
+    {
+        size_t operator()(const std::string &__x) const
+        {
+            return hash<const char *>()(__x.c_str());
+        }
+    };
 };
 
 #else
-- 
cgit v1.2.3


From 2db4af394927fed0e447dd66c933a7236eb41d39 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Sat, 19 Jun 2010 13:54:19 -0600
Subject: * Changed references to Trinityd.conf / trinitycore.conf to proper *
 worldserver.conf

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp                 |  2 +-
 src/server/game/Globals/ObjectMgr.cpp                    |  8 ++++----
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp |  2 +-
 src/server/game/World/World.cpp                          | 16 ++++++++--------
 src/server/shared/Database/Database.h                    |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 510fbdad100..928b9f4f9e6 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -579,7 +579,7 @@ void LoadDBCStores(const std::string& dataPath)
     // error checks
     if (bad_dbc_files.size() >= DBCFilesCount)
     {
-        sLog.outError("\nIncorrect DataDir value in Trinityd.conf or ALL required *.dbc files (%d) not found by path: %sdbc",DBCFilesCount,dataPath.c_str());
+        sLog.outError("\nIncorrect DataDir value in worldserver.conf or ALL required *.dbc files (%d) not found by path: %sdbc",DBCFilesCount,dataPath.c_str());
         exit(1);
     }
     else if (!bad_dbc_files.empty())
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index e78dc02a93f..d616806a7cc 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2587,7 +2587,7 @@ void ObjectMgr::LoadPetLevelInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `pet_levelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3024,7 +3024,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_classlevelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `player_classlevelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3121,7 +3121,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `player_levelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3231,7 +3231,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in TrinityCore.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 378a817137d..e4d329e6afc 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -374,7 +374,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
         return;
     }
 
-    //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in TrinityCore.conf
+    //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in worldserver.conf
     if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() ||
         GetSecurity() >= sWorld.getConfig(CONFIG_INSTANT_LOGOUT))
     {
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8a98da41cc1..4da78277c96 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -652,7 +652,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
         if (val != m_configs[CONFIG_PORT_WORLD])
-            sLog.outError("WorldServerPort option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_PORT_WORLD]);
+            sLog.outError("WorldServerPort option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_PORT_WORLD]);
     }
     else
         m_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
@@ -661,7 +661,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
         if (val != m_configs[CONFIG_SOCKET_SELECTTIME])
-            sLog.outError("SocketSelectTime option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]);
+            sLog.outError("SocketSelectTime option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]);
     }
     else
         m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
@@ -670,7 +670,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_SESSION_ADD_DELAY] = sConfig.GetIntDefault("SessionAddDelay", 10000);
 
     m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74);
-    /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define
+    /// \todo Add MonsterSight and GuarderSight (with meaning) in worldserver.conf or put them as define
     m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50);
     m_configs[CONFIG_SIGHT_GUARDER] = sConfig.GetIntDefault("GuarderSight", 50);
 
@@ -678,7 +678,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("GameType", 0);
         if (val != m_configs[CONFIG_GAME_TYPE])
-            sLog.outError("GameType option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_GAME_TYPE]);
+            sLog.outError("GameType option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_GAME_TYPE]);
     }
     else
         m_configs[CONFIG_GAME_TYPE] = sConfig.GetIntDefault("GameType", 0);
@@ -687,7 +687,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
         if (val != m_configs[CONFIG_REALM_ZONE])
-            sLog.outError("RealmZone option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_REALM_ZONE]);
+            sLog.outError("RealmZone option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_REALM_ZONE]);
     }
     else
         m_configs[CONFIG_REALM_ZONE] = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
@@ -991,7 +991,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("Expansion",1);
         if (val != m_configs[CONFIG_EXPANSION])
-            sLog.outError("Expansion option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_EXPANSION]);
+            sLog.outError("Expansion option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_EXPANSION]);
     }
     else
         m_configs[CONFIG_EXPANSION] = sConfig.GetIntDefault("Expansion",1);
@@ -1181,7 +1181,7 @@ void World::LoadConfigSettings(bool reload)
     if (reload)
     {
         if (dataPath != m_dataPath)
-            sLog.outError("DataDir option can't be changed at Trinityd.conf reload, using current value (%s).",m_dataPath.c_str());
+            sLog.outError("DataDir option can't be changed at worldserver.conf reload, using current value (%s).",m_dataPath.c_str());
     }
     else
     {
@@ -1274,7 +1274,7 @@ void World::SetInitialWorldSettings()
         ||m_configs[CONFIG_EXPANSION] && (
         !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f)))
     {
-        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
+        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         exit(1);
     }
 
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 1a516bdc3d7..96588adbf10 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -117,7 +117,7 @@ class Database
         bool _UpdateDataBlobValue(const uint32 guid, const uint32 field, const int32 value);
         bool _SetDataBlobValue(const uint32 guid, const uint32 field, const uint32 value);
 
-        // Writes SQL commands to a LOG file (see Trinityd.conf "LogSQL")
+        // Writes SQL commands to a LOG file (see worldserver.conf "LogSQL")
         bool PExecuteLog(const char *format,...) ATTR_PRINTF(2,3);
 
         bool BeginTransaction();
-- 
cgit v1.2.3


From 1c96f52568d680e320b58874df31caabae536f4c Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Mon, 21 Jun 2010 07:17:26 +0200
Subject: Add more CMake-related support for building g3dlib, zlib, bzip2, ace
 on Windows

--HG--
branch : trunk
---
 externals/CMakeLists.txt                 |  28 +-
 externals/ace/CMakeLists.txt             |  24 ++
 externals/bzip2/CMakeLists.txt           |  12 +
 externals/g3dlite/CMakeLists.txt         |  35 +-
 externals/jemalloc/CMakeLists.txt        |  10 +
 externals/sockets/CMakeLists.txt         |  11 +
 externals/zlib/CMakeLists.txt            |  10 +
 src/CMakeLists.txt                       |   4 +-
 src/server/CMakeLists.txt                |  15 +-
 src/server/authserver/CMakeLists.txt     |  26 +-
 src/server/collision/CMakeLists.txt      |  38 +-
 src/server/game/CMakeLists.txt           | 673 ++++++++++++++++---------------
 src/server/scripts/CMakeLists.txt        |  66 +--
 src/server/shared/CMakeLists.txt         | 128 +++---
 src/server/worldserver/CMakeLists.txt    |  92 +++--
 src/tools/CMakeLists.txt                 |   2 +-
 src/tools/map_extractor/CMakeLists.txt   |  30 +-
 src/tools/vmap3_assembler/CMakeLists.txt |  21 +-
 src/tools/vmap3_extractor/CMakeLists.txt |  21 +-
 19 files changed, 712 insertions(+), 534 deletions(-)
 create mode 100644 externals/ace/CMakeLists.txt

(limited to 'src/server/shared')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index fea7526b9c8..98381bbafdc 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,8 +1,26 @@
-#add_subdirectory(ace)
-#add_subdirectory(libmpq)
+# 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.
+
+if(NOT MACOSX)
+  add_subdirectory(jemalloc)
+endif()
+
+if(NOT UNIX)
+  add_subdirectory(ace)
+  add_subdirectory(zlib)
+  add_subdirectory(bzip2)
+endif()
 
-add_subdirectory(zlib)
-add_subdirectory(bzip2)
 add_subdirectory(g3dlite)
-add_subdirectory(jemalloc)
 add_subdirectory(sockets)
+
+# temporary disable libmpq building (through CMake at least) for now
+# - needs a proper CMakeLists.txt
+#add_subdirectory(libmpq)
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
new file mode 100644
index 00000000000..fe2a2488d9f
--- /dev/null
+++ b/externals/ace/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 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.
+
+file(GLOB sources *.cpp)
+
+set(ace_STAT_SRCS
+  ${sources}
+)
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/externals
+  ${CMAKE_SOURCE_DIR}/externals/zlib
+)
+
+add_definitions(-DACE_BUILD_DLL)
+
+add_library(ace STATIC ${ace_STAT_SRCS})
diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt
index ef857f462ab..3de5475610a 100644
--- a/externals/bzip2/CMakeLists.txt
+++ b/externals/bzip2/CMakeLists.txt
@@ -1,9 +1,21 @@
+# 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.
+
 file(GLOB sources *.c)
+
 set(bzip2_STAT_SRCS
   ${sources}
 )
 
 include_directories(
+  ${CMAKE_SOURCE_DIR}/externals/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/externals/g3dlite/CMakeLists.txt b/externals/g3dlite/CMakeLists.txt
index 9f302eff960..da5c89ec143 100644
--- a/externals/g3dlite/CMakeLists.txt
+++ b/externals/g3dlite/CMakeLists.txt
@@ -1,12 +1,37 @@
+# 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.
+
 file(GLOB sources *.cpp)
 
-SET(g3dlib_STAT_SRCS
+set(g3dlib_STAT_SRCS
   ${sources}
+)
+if(WIN32)
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/externals/zlib
   )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
+else()
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
   )
+endif()
 
 add_library(g3dlib STATIC ${g3dlib_STAT_SRCS})
-target_link_libraries(g3dlib zlib)
+
+if(WIN32)
+  target_link_libraries(g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt
index 1e32407b456..d560c6ba675 100644
--- a/externals/jemalloc/CMakeLists.txt
+++ b/externals/jemalloc/CMakeLists.txt
@@ -1,5 +1,15 @@
+# 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.
 
 file(GLOB sources *.c)
+
 set(jemalloc_STAT_SRC
   ${sources}
 )
diff --git a/externals/sockets/CMakeLists.txt b/externals/sockets/CMakeLists.txt
index 716da975ca9..a1756773c08 100644
--- a/externals/sockets/CMakeLists.txt
+++ b/externals/sockets/CMakeLists.txt
@@ -1,4 +1,15 @@
+# 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.
+
 file(GLOB sources *.cpp)
+
 set(trinitysockets_STAT_SRCS
   ${sources}
 )
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt
index 1887110020c..bd194531bb5 100644
--- a/externals/zlib/CMakeLists.txt
+++ b/externals/zlib/CMakeLists.txt
@@ -1,3 +1,13 @@
+# 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.
+
 file(GLOB sources *.c)
 file(GLOB headers *.h)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 76c3de027eb..b7fd8c75336 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -11,6 +11,6 @@
 add_subdirectory(server)
 
 if(DO_TOOLS)
-    add_subdirectory(tools)
+  add_subdirectory(tools)
 endif(DO_TOOLS)
 
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index cf835f7ca66..5d9b3b2ef9f 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -14,16 +14,17 @@ if(DO_WORLDSERVER)
   add_subdirectory(collision)
   if(DO_SCRIPTS)
     add_subdirectory(scripts)
-  endif(DO_SCRIPTS)
+  endif()
   add_subdirectory(worldserver)
-else(DO_WORLDSERVER)
+else()
   if(DO_TOOLS)
     add_subdirectory(collision)
-  endif(DO_TOOLS)
-endif(DO_WORLDSERVER)
+  endif()
+endif()
+
 if (DO_AUTHSERVER)
   if(NOT DO_WORLDSERVER)
     add_subdirectory(shared)
-  endif(NOT DO_WORLDSERVER)
+  endif()
   add_subdirectory(authserver)
-endif(DO_AUTHSERVER)
\ No newline at end of file
+endif()
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index c3f5fe6331b..6cfefb69443 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -10,7 +10,7 @@
 
 ########### authserver ###############
 
-SET(authserver_SRCS
+set(authserver_SRCS
   Authentication/AuthCodes.cpp
   Authentication/AuthCodes.h
   Realms/RealmList.cpp
@@ -41,20 +41,21 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
 )
 
-SET(authserver_LINK_FLAGS "")
+set(authserver_LINK_FLAGS "")
 
-add_executable(authserver ${authserver_SRCS})
-add_definitions(
-  -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
+add_executable(authserver
+  ${authserver_SRCS}
 )
 
-SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
+add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
-SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
+endif()
+
+set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 target_link_libraries(
   authserver
@@ -67,8 +68,7 @@ target_link_libraries(
   ${OSX_LIBS}
 )
 
-install(TARGETS authserver DESTINATION bin)
-
 ########### install files ###############
 
+install(TARGETS authserver DESTINATION bin)
 install(FILES  authserver.conf.dist DESTINATION etc)
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 0dbb44ba05b..b71f19496fe 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -10,24 +10,24 @@
 
 ########### collision ###############
 
-SET(collision_STAT_SRCS
-   BoundingIntervalHierarchy.h
-   BoundingIntervalHierarchy.cpp
-   Maps/MapTree.cpp
-   Maps/MapTree.h
-   Maps/TileAssembler.cpp
-   Maps/TileAssembler.h
-   Models/ModelInstance.cpp
-   Models/ModelInstance.h
-   Models/WorldModel.cpp
-   Models/WorldModel.h
-   Management/IVMapManager.h
-   Management/VMapFactory.cpp
-   Management/VMapFactory.h
-   Management/VMapManager2.cpp
-   Management/VMapManager2.h
-   VMapDefinitions.h
-   VMapTools.h
+set(collision_STAT_SRCS
+  BoundingIntervalHierarchy.h
+  BoundingIntervalHierarchy.cpp
+  Maps/MapTree.cpp
+  Maps/MapTree.h
+  Maps/TileAssembler.cpp
+  Maps/TileAssembler.h
+  Models/ModelInstance.cpp
+  Models/ModelInstance.h
+  Models/WorldModel.cpp
+  Models/WorldModel.h
+  Management/IVMapManager.h
+  Management/VMapFactory.cpp
+  Management/VMapFactory.h
+  Management/VMapManager2.cpp
+  Management/VMapManager2.h
+  VMapDefinitions.h
+  VMapTools.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 8616c730d18..387b2365f47 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -11,321 +11,322 @@
 ######## game ########
 
 # Enable precompiled headers when using the GCC compiler.
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+endif()
 
-SET(game_STAT_SRCS
-   Accounts/AccountMgr.cpp
-   Accounts/AccountMgr.h
-   Achievements/AchievementMgr.h
-   Achievements/AchievementMgr.cpp
-   Addons/AddonMgr.cpp
-   Addons/AddonMgr.h
-   AI/CoreAI/CombatAI.cpp
-   AI/CoreAI/CombatAI.h
-   AI/CoreAI/GuardAI.cpp
-   AI/CoreAI/GuardAI.h
-   AI/CoreAI/PassiveAI.cpp
-   AI/CoreAI/PassiveAI.h
-   AI/CoreAI/PetAI.cpp
-   AI/CoreAI/PetAI.h
-   AI/CoreAI/ReactorAI.cpp
-   AI/CoreAI/ReactorAI.h
-   AI/CoreAI/TotemAI.cpp
-   AI/CoreAI/TotemAI.h
-   AI/CoreAI/UnitAI.cpp
-   AI/CoreAI/UnitAI.h
-   AI/EventAI/CreatureEventAI.cpp
-   AI/EventAI/CreatureEventAIMgr.cpp
-   AI/ScriptedAI/ScriptedSmartAI.cpp
-   AI/ScriptedAI/ScriptedSmartAI.h
-   AI/CreatureAIFactory.h
-   AI/CreatureAIImpl.h
-   AI/CreatureAIRegistry.cpp
-   AI/CreatureAIRegistry.h
-   AI/CreatureAISelector.cpp
-   AI/CreatureAISelector.h
-   AI/CreatureAI.cpp
-   AI/CreatureAI.h
-   AuctionHouse/AuctionHouseMgr.cpp
-   AuctionHouse/AuctionHouseMgr.h
-   AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
-   AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
-   BattleGrounds/ArenaTeam.cpp
-   BattleGrounds/ArenaTeam.h
-   BattleGrounds/Zones/BattleGroundAA.cpp
-   BattleGrounds/Zones/BattleGroundAA.h
-   BattleGrounds/Zones/BattleGroundAB.cpp
-   BattleGrounds/Zones/BattleGroundAB.h
-   BattleGrounds/Zones/BattleGroundRB.cpp
-   BattleGrounds/Zones/BattleGroundRB.h
-   BattleGrounds/Zones/BattleGroundAV.cpp
-   BattleGrounds/Zones/BattleGroundAV.h
-   BattleGrounds/Zones/BattleGroundBE.cpp
-   BattleGrounds/Zones/BattleGroundBE.h
-   BattleGrounds/Zones/BattleGroundDS.cpp
-   BattleGrounds/Zones/BattleGroundDS.h
-   BattleGrounds/Zones/BattleGroundEY.cpp
-   BattleGrounds/Zones/BattleGroundEY.h
-   BattleGrounds/Zones/BattleGroundIC.cpp
-   BattleGrounds/Zones/BattleGroundIC.h
-   BattleGrounds/Zones/BattleGroundNA.cpp
-   BattleGrounds/Zones/BattleGroundNA.h
-   BattleGrounds/Zones/BattleGroundRL.cpp
-   BattleGrounds/Zones/BattleGroundRL.h
-   BattleGrounds/Zones/BattleGroundRV.cpp
-   BattleGrounds/Zones/BattleGroundRV.h
-   BattleGrounds/Zones/BattleGroundSA.cpp
-   BattleGrounds/Zones/BattleGroundSA.h
-   BattleGrounds/Zones/BattleGroundWS.cpp
-   BattleGrounds/Zones/BattleGroundWS.h
-   BattleGrounds/BattleGround.cpp
-   BattleGrounds/BattleGround.h
-   BattleGrounds/BattleGroundMgr.cpp
-   BattleGrounds/BattleGroundMgr.h
-   Calendar/Calendar.cpp
-   Calendar/Calendar.h
-   Chat/Channels/Channel.cpp
-   Chat/Channels/Channel.h
-   Chat/Channels/ChannelMgr.h
-   Chat/Channels/ChannelMgr.cpp
-   Chat/Commands/Debugcmds.cpp
-   Chat/Commands/Level0.cpp
-   Chat/Commands/Level1.cpp
-   Chat/Commands/Level2.cpp
-   Chat/Commands/Level3.cpp
-   Chat/Chat.cpp
-   Chat/Chat.h
-   Combat/HostileRefManager.cpp
-   Combat/HostileRefManager.h
-   Combat/ThreatManager.cpp
-   Combat/ThreatManager.h
-   Combat/UnitEvents.h
-   Conditions/ConditionMgr.cpp
-   Conditions/ConditionMgr.h
-   DataStores/DBCEnums.h
-   DataStores/DBCStores.cpp
-   DataStores/DBCStores.h
-   DataStores/DBCStructure.h
-   DataStores/DBCfmt.h
-   DungeonFinding/LFG.h
-   DungeonFinding/LFGMgr.cpp
-   DungeonFinding/LFGMgr.h
-   Entities/Corpse/Corpse.cpp
-   Entities/Corpse/Corpse.h
-   Entities/Creature/Creature.cpp
-   Entities/Creature/Creature.h
-   Entities/Creature/CreatureGroups.cpp
-   Entities/Creature/CreatureGroups.h
-   Entities/Creature/GossipDef.cpp
-   Entities/Creature/GossipDef.h
-   Entities/Creature/TemporarySummon.cpp
-   Entities/Creature/TemporarySummon.h
-   Entities/DynamicObject/DynamicObject.cpp
-   Entities/DynamicObject/DynamicObject.h
-   Entities/GameObject/GameObject.cpp
-   Entities/GameObject/GameObject.h
-   Entities/Item/Container/Bag.cpp
-   Entities/Item/Container/Bag.h
-   Entities/Item/Item.cpp
-   Entities/Item/Item.h
-   Entities/Item/ItemEnchantmentMgr.cpp
-   Entities/Item/ItemEnchantmentMgr.h
-   Entities/Item/ItemPrototype.h
-   Entities/Object/Updates/UpdateData.cpp
-   Entities/Object/Updates/UpdateData.h
-   Entities/Object/Updates/UpdateFields.h
-   Entities/Object/Updates/UpdateMask.h
-   Entities/Object/ObjectDefines.h
-   Entities/Object/Object.cpp
-   Entities/Object/Object.h
-   Entities/Object/ObjectPosSelector.cpp
-   Entities/Object/ObjectPosSelector.h
-   Entities/Pet/Pet.cpp
-   Entities/Pet/Pet.h
-   Entities/Player/Player.cpp
-   Entities/Player/Player.h
-   Entities/Player/SocialMgr.cpp
-   Entities/Player/SocialMgr.h
-   Entities/Unit/StatSystem.cpp
-   Entities/Unit/Unit.cpp
-   Entities/Unit/Unit.h
-   Entities/Totem/Totem.cpp
-   Entities/Totem/Totem.h
-   Entities/Transport/Transport.cpp
-   Entities/Transport/Transport.h
-   Entities/Vehicle/Vehicle.cpp
-   Entities/Vehicle/Vehicle.h
-   Events/GameEventMgr.cpp
-   Events/GameEventMgr.h
-   Globals/GlobalEvents.cpp
-   Globals/GlobalEvents.h
-   Globals/ObjectAccessor.cpp
-   Globals/ObjectAccessor.h
-   Globals/ObjectMgr.cpp
-   Globals/ObjectMgr.h
-   Grids/Cells/Cell.h
-   Grids/Cells/CellImpl.h
-   Grids/Notifiers/GridNotifiers.cpp
-   Grids/Notifiers/GridNotifiers.h
-   Grids/Notifiers/GridNotifiersImpl.h
-   Grids/GridDefines.h
-   Grids/GridStates.cpp
-   Grids/GridStates.h
-   Grids/ObjectGridLoader.cpp
-   Grids/ObjectGridLoader.h
-   Groups/Group.cpp
-   Groups/Group.h
-   Groups/GroupReference.cpp
-   Groups/GroupReference.h
-   Groups/GroupRefManager.h
-   Guilds/Guild.cpp
-   Guilds/Guild.h
-   Instances/InstanceData.cpp
-   Instances/InstanceData.h
-   Instances/InstanceSaveMgr.cpp
-   Instances/InstanceSaveMgr.h
-   Loot/LootMgr.cpp
-   Loot/LootMgr.h
-   Mails/Mail.cpp
-   Mails/Mail.h
-   Maps/Map.cpp
-   Maps/Map.h
-   Maps/MapInstanced.cpp
-   Maps/MapInstanced.h
-   Maps/MapManager.cpp
-   Maps/MapManager.h
-   Maps/MapUpdater.cpp
-   Maps/MapUpdater.h
-   Maps/MapReference.h
-   Maps/MapRefManager.h
-   Maps/ZoneScript.h
-   Miscellaneous/Formulas.h
-   Miscellaneous/Language.h
-   Miscellaneous/SharedDefines.h
-   Movement/MovementGenerators/ConfusedMovementGenerator.cpp
-   Movement/MovementGenerators/ConfusedMovementGenerator.h
-   Movement/MovementGenerators/FleeingMovementGenerator.cpp
-   Movement/MovementGenerators/FleeingMovementGenerator.h
-   Movement/MovementGenerators/HomeMovementGenerator.cpp
-   Movement/MovementGenerators/HomeMovementGenerator.h
-   Movement/MovementGenerators/IdleMovementGenerator.cpp
-   Movement/MovementGenerators/IdleMovementGenerator.h
-   Movement/MovementGenerators/PointMovementGenerator.cpp
-   Movement/MovementGenerators/PointMovementGenerator.h
-   Movement/MovementGenerators/RandomMovementGenerator.cpp
-   Movement/MovementGenerators/RandomMovementGenerator.h
-   Movement/MovementGenerators/TargetedMovementGenerator.cpp
-   Movement/MovementGenerators/TargetedMovementGenerator.h
-   Movement/MovementGenerators/WaypointMovementGenerator.cpp
-   Movement/MovementGenerators/WaypointMovementGenerator.h
-   Movement/Waypoints/Path.h
-   Movement/Waypoints/WaypointManager.cpp
-   Movement/Waypoints/WaypointManager.h
-   Movement/DestinationHolder.cpp
-   Movement/DestinationHolder.h
-   Movement/DestinationHolderImp.h
-   Movement/FollowerReference.cpp
-   Movement/FollowerReference.h
-   Movement/FollowerRefManager.h
-   Movement/MotionMaster.cpp
-   Movement/MotionMaster.h
-   Movement/MovementGenerator.cpp
-   Movement/MovementGenerator.h
-   Movement/MovementGeneratorImpl.h
-   Movement/Traveller.h
-   OutdoorPvP/Zones/OutdoorPvPEP.cpp
-   OutdoorPvP/Zones/OutdoorPvPEP.h
-   OutdoorPvP/Zones/OutdoorPvPHP.cpp
-   OutdoorPvP/Zones/OutdoorPvPHP.h
-   OutdoorPvP/Zones/OutdoorPvPNA.cpp
-   OutdoorPvP/Zones/OutdoorPvPNA.h
-   OutdoorPvP/Zones/OutdoorPvPSI.cpp
-   OutdoorPvP/Zones/OutdoorPvPSI.h
-   OutdoorPvP/Zones/OutdoorPvPTF.cpp
-   OutdoorPvP/Zones/OutdoorPvPTF.h
-   OutdoorPvP/Zones/OutdoorPvPZM.cpp
-   OutdoorPvP/Zones/OutdoorPvPZM.h
-   OutdoorPvP/OutdoorPvP.cpp
-   OutdoorPvP/OutdoorPvP.h
-   OutdoorPvP/OutdoorPvPImpl.h
-   OutdoorPvP/OutdoorPvPMgr.cpp
-   OutdoorPvP/OutdoorPvPMgr.h
-   Pools/PoolHandler.cpp
-   Pools/PoolHandler.h
-   Quests/QuestDef.cpp
-   Quests/QuestDef.h
-   Reputation/ReputationMgr.cpp
-   Reputation/ReputationMgr.h
-   Scripting/ScriptLoader.cpp
-   Scripting/ScriptLoader.h
-   Scripting/ScriptMgr.cpp
-   Scripting/ScriptMgr.h
-   Scripting/ScriptSystem.cpp
-   Scripting/ScriptSystem.h
-   Server/Protocol/Handlers/AddonHandler.cpp
-   Server/Protocol/Handlers/AddonHandler.h
-   Server/Protocol/Handlers/ArenaTeamHandler.cpp
-   Server/Protocol/Handlers/AuctionHouseHandler.cpp
-   Server/Protocol/Handlers/BattleGroundHandler.cpp
-   Server/Protocol/Handlers/CalendarHandler.cpp
-   Server/Protocol/Handlers/ChannelHandler.cpp
-   Server/Protocol/Handlers/CharacterHandler.cpp
-   Server/Protocol/Handlers/ChatHandler.cpp
-   Server/Protocol/Handlers/CombatHandler.cpp
-   Server/Protocol/Handlers/DuelHandler.cpp
-   Server/Protocol/Handlers/GroupHandler.cpp
-   Server/Protocol/Handlers/GuildHandler.cpp
-   Server/Protocol/Handlers/ItemHandler.cpp
-   Server/Protocol/Handlers/LFGHandler.cpp
-   Server/Protocol/Handlers/LootHandler.cpp
-   Server/Protocol/Handlers/MiscHandler.cpp
-   Server/Protocol/Handlers/MovementHandler.cpp
-   Server/Protocol/Handlers/NPCHandler.cpp
-   Server/Protocol/Handlers/NPCHandler.h
-   Server/Protocol/Handlers/PetHandler.cpp
-   Server/Protocol/Handlers/PetitionsHandler.cpp
-   Server/Protocol/Handlers/QueryHandler.cpp
-   Server/Protocol/Handlers/QuestHandler.cpp
-   Server/Protocol/Handlers/SkillHandler.cpp
-   Server/Protocol/Handlers/SpellHandler.cpp
-   Server/Protocol/Handlers/TaxiHandler.cpp
-   Server/Protocol/Handlers/TicketHandler.cpp
-   Server/Protocol/Handlers/TradeHandler.cpp
-   Server/Protocol/Handlers/VoiceChatHandler.cpp
-   Server/Protocol/Opcodes.cpp
-   Server/Protocol/Opcodes.h
-   Server/Protocol/WorldLog.cpp
-   Server/Protocol/WorldLog.h
-   Server/WorldSession.cpp
-   Server/WorldSession.h
-   Server/WorldSocket.cpp
-   Server/WorldSocket.h
-   Server/WorldSocketMgr.cpp
-   Server/WorldSocketMgr.h
-   Skills/SkillDiscovery.cpp
-   Skills/SkillDiscovery.h
-   Skills/SkillExtraItems.cpp
-   Skills/SkillExtraItems.h
-   Spells/Auras/SpellAuraDefines.h
-   Spells/Auras/SpellAuras.cpp
-   Spells/Auras/SpellAuras.h
-   Spells/Auras/SpellAuraEffects.cpp
-   Spells/Auras/SpellAuraEffects.h
-   Spells/Auras/SpellEffects.cpp
-   Spells/Spell.cpp
-   Spells/Spell.h
-   Spells/SpellMgr.cpp
-   Spells/SpellMgr.h
-   Tools/PlayerDump.cpp
-   Tools/PlayerDump.h
-   Tools/Tools.cpp
-   Tools/Tools.h
-   Weather/Weather.cpp
-   Weather/Weather.h
-   World/World.cpp
-   World/World.h
+# Create game-libary
+set(game_STAT_SRCS
+  Accounts/AccountMgr.cpp
+  Accounts/AccountMgr.h
+  Achievements/AchievementMgr.h
+  Achievements/AchievementMgr.cpp
+  Addons/AddonMgr.cpp
+  Addons/AddonMgr.h
+  AI/CoreAI/CombatAI.cpp
+  AI/CoreAI/CombatAI.h
+  AI/CoreAI/GuardAI.cpp
+  AI/CoreAI/GuardAI.h
+  AI/CoreAI/PassiveAI.cpp
+  AI/CoreAI/PassiveAI.h
+  AI/CoreAI/PetAI.cpp
+  AI/CoreAI/PetAI.h
+  AI/CoreAI/ReactorAI.cpp
+  AI/CoreAI/ReactorAI.h
+  AI/CoreAI/TotemAI.cpp
+  AI/CoreAI/TotemAI.h
+  AI/CoreAI/UnitAI.cpp
+  AI/CoreAI/UnitAI.h
+  AI/EventAI/CreatureEventAI.cpp
+  AI/EventAI/CreatureEventAIMgr.cpp
+  AI/ScriptedAI/ScriptedSmartAI.cpp
+  AI/ScriptedAI/ScriptedSmartAI.h
+  AI/CreatureAIFactory.h
+  AI/CreatureAIImpl.h
+  AI/CreatureAIRegistry.cpp
+  AI/CreatureAIRegistry.h
+  AI/CreatureAISelector.cpp
+  AI/CreatureAISelector.h
+  AI/CreatureAI.cpp
+  AI/CreatureAI.h
+  AuctionHouse/AuctionHouseMgr.cpp
+  AuctionHouse/AuctionHouseMgr.h
+  AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+  AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+  BattleGrounds/ArenaTeam.cpp
+  BattleGrounds/ArenaTeam.h
+  BattleGrounds/Zones/BattleGroundAA.cpp
+  BattleGrounds/Zones/BattleGroundAA.h
+  BattleGrounds/Zones/BattleGroundAB.cpp
+  BattleGrounds/Zones/BattleGroundAB.h
+  BattleGrounds/Zones/BattleGroundRB.cpp
+  BattleGrounds/Zones/BattleGroundRB.h
+  BattleGrounds/Zones/BattleGroundAV.cpp
+  BattleGrounds/Zones/BattleGroundAV.h
+  BattleGrounds/Zones/BattleGroundBE.cpp
+  BattleGrounds/Zones/BattleGroundBE.h
+  BattleGrounds/Zones/BattleGroundDS.cpp
+  BattleGrounds/Zones/BattleGroundDS.h
+  BattleGrounds/Zones/BattleGroundEY.cpp
+  BattleGrounds/Zones/BattleGroundEY.h
+  BattleGrounds/Zones/BattleGroundIC.cpp
+  BattleGrounds/Zones/BattleGroundIC.h
+  BattleGrounds/Zones/BattleGroundNA.cpp
+  BattleGrounds/Zones/BattleGroundNA.h
+  BattleGrounds/Zones/BattleGroundRL.cpp
+  BattleGrounds/Zones/BattleGroundRL.h
+  BattleGrounds/Zones/BattleGroundRV.cpp
+  BattleGrounds/Zones/BattleGroundRV.h
+  BattleGrounds/Zones/BattleGroundSA.cpp
+  BattleGrounds/Zones/BattleGroundSA.h
+  BattleGrounds/Zones/BattleGroundWS.cpp
+  BattleGrounds/Zones/BattleGroundWS.h
+  BattleGrounds/BattleGround.cpp
+  BattleGrounds/BattleGround.h
+  BattleGrounds/BattleGroundMgr.cpp
+  BattleGrounds/BattleGroundMgr.h
+  Calendar/Calendar.cpp
+  Calendar/Calendar.h
+  Chat/Channels/Channel.cpp
+  Chat/Channels/Channel.h
+  Chat/Channels/ChannelMgr.h
+  Chat/Channels/ChannelMgr.cpp
+  Chat/Commands/Debugcmds.cpp
+  Chat/Commands/Level0.cpp
+  Chat/Commands/Level1.cpp
+  Chat/Commands/Level2.cpp
+  Chat/Commands/Level3.cpp
+  Chat/Chat.cpp
+  Chat/Chat.h
+  Combat/HostileRefManager.cpp
+  Combat/HostileRefManager.h
+  Combat/ThreatManager.cpp
+  Combat/ThreatManager.h
+  Combat/UnitEvents.h
+  Conditions/ConditionMgr.cpp
+  Conditions/ConditionMgr.h
+  DataStores/DBCEnums.h
+  DataStores/DBCStores.cpp
+  DataStores/DBCStores.h
+  DataStores/DBCStructure.h
+  DataStores/DBCfmt.h
+  DungeonFinding/LFG.h
+  DungeonFinding/LFGMgr.cpp
+  DungeonFinding/LFGMgr.h
+  Entities/Corpse/Corpse.cpp
+  Entities/Corpse/Corpse.h
+  Entities/Creature/Creature.cpp
+  Entities/Creature/Creature.h
+  Entities/Creature/CreatureGroups.cpp
+  Entities/Creature/CreatureGroups.h
+  Entities/Creature/GossipDef.cpp
+  Entities/Creature/GossipDef.h
+  Entities/Creature/TemporarySummon.cpp
+  Entities/Creature/TemporarySummon.h
+  Entities/DynamicObject/DynamicObject.cpp
+  Entities/DynamicObject/DynamicObject.h
+  Entities/GameObject/GameObject.cpp
+  Entities/GameObject/GameObject.h
+  Entities/Item/Container/Bag.cpp
+  Entities/Item/Container/Bag.h
+  Entities/Item/Item.cpp
+  Entities/Item/Item.h
+  Entities/Item/ItemEnchantmentMgr.cpp
+  Entities/Item/ItemEnchantmentMgr.h
+  Entities/Item/ItemPrototype.h
+  Entities/Object/Updates/UpdateData.cpp
+  Entities/Object/Updates/UpdateData.h
+  Entities/Object/Updates/UpdateFields.h
+  Entities/Object/Updates/UpdateMask.h
+  Entities/Object/ObjectDefines.h
+  Entities/Object/Object.cpp
+  Entities/Object/Object.h
+  Entities/Object/ObjectPosSelector.cpp
+  Entities/Object/ObjectPosSelector.h
+  Entities/Pet/Pet.cpp
+  Entities/Pet/Pet.h
+  Entities/Player/Player.cpp
+  Entities/Player/Player.h
+  Entities/Player/SocialMgr.cpp
+  Entities/Player/SocialMgr.h
+  Entities/Unit/StatSystem.cpp
+  Entities/Unit/Unit.cpp
+  Entities/Unit/Unit.h
+  Entities/Totem/Totem.cpp
+  Entities/Totem/Totem.h
+  Entities/Transport/Transport.cpp
+  Entities/Transport/Transport.h
+  Entities/Vehicle/Vehicle.cpp
+  Entities/Vehicle/Vehicle.h
+  Events/GameEventMgr.cpp
+  Events/GameEventMgr.h
+  Globals/GlobalEvents.cpp
+  Globals/GlobalEvents.h
+  Globals/ObjectAccessor.cpp
+  Globals/ObjectAccessor.h
+  Globals/ObjectMgr.cpp
+  Globals/ObjectMgr.h
+  Grids/Cells/Cell.h
+  Grids/Cells/CellImpl.h
+  Grids/Notifiers/GridNotifiers.cpp
+  Grids/Notifiers/GridNotifiers.h
+  Grids/Notifiers/GridNotifiersImpl.h
+  Grids/GridDefines.h
+  Grids/GridStates.cpp
+  Grids/GridStates.h
+  Grids/ObjectGridLoader.cpp
+  Grids/ObjectGridLoader.h
+  Groups/Group.cpp
+  Groups/Group.h
+  Groups/GroupReference.cpp
+  Groups/GroupReference.h
+  Groups/GroupRefManager.h
+  Guilds/Guild.cpp
+  Guilds/Guild.h
+  Instances/InstanceData.cpp
+  Instances/InstanceData.h
+  Instances/InstanceSaveMgr.cpp
+  Instances/InstanceSaveMgr.h
+  Loot/LootMgr.cpp
+  Loot/LootMgr.h
+  Mails/Mail.cpp
+  Mails/Mail.h
+  Maps/Map.cpp
+  Maps/Map.h
+  Maps/MapInstanced.cpp
+  Maps/MapInstanced.h
+  Maps/MapManager.cpp
+  Maps/MapManager.h
+  Maps/MapUpdater.cpp
+  Maps/MapUpdater.h
+  Maps/MapReference.h
+  Maps/MapRefManager.h
+  Maps/ZoneScript.h
+  Miscellaneous/Formulas.h
+  Miscellaneous/Language.h
+  Miscellaneous/SharedDefines.h
+  Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+  Movement/MovementGenerators/ConfusedMovementGenerator.h
+  Movement/MovementGenerators/FleeingMovementGenerator.cpp
+  Movement/MovementGenerators/FleeingMovementGenerator.h
+  Movement/MovementGenerators/HomeMovementGenerator.cpp
+  Movement/MovementGenerators/HomeMovementGenerator.h
+  Movement/MovementGenerators/IdleMovementGenerator.cpp
+  Movement/MovementGenerators/IdleMovementGenerator.h
+  Movement/MovementGenerators/PointMovementGenerator.cpp
+  Movement/MovementGenerators/PointMovementGenerator.h
+  Movement/MovementGenerators/RandomMovementGenerator.cpp
+  Movement/MovementGenerators/RandomMovementGenerator.h
+  Movement/MovementGenerators/TargetedMovementGenerator.cpp
+  Movement/MovementGenerators/TargetedMovementGenerator.h
+  Movement/MovementGenerators/WaypointMovementGenerator.cpp
+  Movement/MovementGenerators/WaypointMovementGenerator.h
+  Movement/Waypoints/Path.h
+  Movement/Waypoints/WaypointManager.cpp
+  Movement/Waypoints/WaypointManager.h
+  Movement/DestinationHolder.cpp
+  Movement/DestinationHolder.h
+  Movement/DestinationHolderImp.h
+  Movement/FollowerReference.cpp
+  Movement/FollowerReference.h
+  Movement/FollowerRefManager.h
+  Movement/MotionMaster.cpp
+  Movement/MotionMaster.h
+  Movement/MovementGenerator.cpp
+  Movement/MovementGenerator.h
+  Movement/MovementGeneratorImpl.h
+  Movement/Traveller.h
+  OutdoorPvP/Zones/OutdoorPvPEP.cpp
+  OutdoorPvP/Zones/OutdoorPvPEP.h
+  OutdoorPvP/Zones/OutdoorPvPHP.cpp
+  OutdoorPvP/Zones/OutdoorPvPHP.h
+  OutdoorPvP/Zones/OutdoorPvPNA.cpp
+  OutdoorPvP/Zones/OutdoorPvPNA.h
+  OutdoorPvP/Zones/OutdoorPvPSI.cpp
+  OutdoorPvP/Zones/OutdoorPvPSI.h
+  OutdoorPvP/Zones/OutdoorPvPTF.cpp
+  OutdoorPvP/Zones/OutdoorPvPTF.h
+  OutdoorPvP/Zones/OutdoorPvPZM.cpp
+  OutdoorPvP/Zones/OutdoorPvPZM.h
+  OutdoorPvP/OutdoorPvP.cpp
+  OutdoorPvP/OutdoorPvP.h
+  OutdoorPvP/OutdoorPvPImpl.h
+  OutdoorPvP/OutdoorPvPMgr.cpp
+  OutdoorPvP/OutdoorPvPMgr.h
+  Pools/PoolHandler.cpp
+  Pools/PoolHandler.h
+  Quests/QuestDef.cpp
+  Quests/QuestDef.h
+  Reputation/ReputationMgr.cpp
+  Reputation/ReputationMgr.h
+  Scripting/ScriptLoader.cpp
+  Scripting/ScriptLoader.h
+  Scripting/ScriptMgr.cpp
+  Scripting/ScriptMgr.h
+  Scripting/ScriptSystem.cpp
+  Scripting/ScriptSystem.h
+  Server/Protocol/Handlers/AddonHandler.cpp
+  Server/Protocol/Handlers/AddonHandler.h
+  Server/Protocol/Handlers/ArenaTeamHandler.cpp
+  Server/Protocol/Handlers/AuctionHouseHandler.cpp
+  Server/Protocol/Handlers/BattleGroundHandler.cpp
+  Server/Protocol/Handlers/CalendarHandler.cpp
+  Server/Protocol/Handlers/ChannelHandler.cpp
+  Server/Protocol/Handlers/CharacterHandler.cpp
+  Server/Protocol/Handlers/ChatHandler.cpp
+  Server/Protocol/Handlers/CombatHandler.cpp
+  Server/Protocol/Handlers/DuelHandler.cpp
+  Server/Protocol/Handlers/GroupHandler.cpp
+  Server/Protocol/Handlers/GuildHandler.cpp
+  Server/Protocol/Handlers/ItemHandler.cpp
+  Server/Protocol/Handlers/LFGHandler.cpp
+  Server/Protocol/Handlers/LootHandler.cpp
+  Server/Protocol/Handlers/MiscHandler.cpp
+  Server/Protocol/Handlers/MovementHandler.cpp
+  Server/Protocol/Handlers/NPCHandler.cpp
+  Server/Protocol/Handlers/NPCHandler.h
+  Server/Protocol/Handlers/PetHandler.cpp
+  Server/Protocol/Handlers/PetitionsHandler.cpp
+  Server/Protocol/Handlers/QueryHandler.cpp
+  Server/Protocol/Handlers/QuestHandler.cpp
+  Server/Protocol/Handlers/SkillHandler.cpp
+  Server/Protocol/Handlers/SpellHandler.cpp
+  Server/Protocol/Handlers/TaxiHandler.cpp
+  Server/Protocol/Handlers/TicketHandler.cpp
+  Server/Protocol/Handlers/TradeHandler.cpp
+  Server/Protocol/Handlers/VoiceChatHandler.cpp
+  Server/Protocol/Opcodes.cpp
+  Server/Protocol/Opcodes.h
+  Server/Protocol/WorldLog.cpp
+  Server/Protocol/WorldLog.h
+  Server/WorldSession.cpp
+  Server/WorldSession.h
+  Server/WorldSocket.cpp
+  Server/WorldSocket.h
+  Server/WorldSocketMgr.cpp
+  Server/WorldSocketMgr.h
+  Skills/SkillDiscovery.cpp
+  Skills/SkillDiscovery.h
+  Skills/SkillExtraItems.cpp
+  Skills/SkillExtraItems.h
+  Spells/Auras/SpellAuraDefines.h
+  Spells/Auras/SpellAuras.cpp
+  Spells/Auras/SpellAuras.h
+  Spells/Auras/SpellAuraEffects.cpp
+  Spells/Auras/SpellAuraEffects.h
+  Spells/Auras/SpellEffects.cpp
+  Spells/Spell.cpp
+  Spells/Spell.h
+  Spells/SpellMgr.cpp
+  Spells/SpellMgr.h
+  Tools/PlayerDump.cpp
+  Tools/PlayerDump.h
+  Tools/Tools.cpp
+  Tools/Tools.h
+  Weather/Weather.cpp
+  Weather/Weather.h
+  World/World.cpp
+  World/World.h
 )
 
 include_directories(
@@ -420,28 +421,28 @@ include_directories(
 )
 
 if(NOT DO_SCRIPTS)
-   SET(game_STAT_SRCS ${game_STAT_SRCS}
-      AI/ScriptedAI/ScriptedEscortAI.cpp
-      AI/ScriptedAI/ScriptedEscortAI.h
-      AI/ScriptedAI/ScriptedCreature.cpp
-      AI/ScriptedAI/ScriptedCreature.h
-      AI/ScriptedAI/ScriptedFollowerAI.cpp
-      AI/ScriptedAI/ScriptedFollowerAI.h
-      AI/ScriptedAI/ScriptedGossip.h
-      AI/ScriptedAI/ScriptedGuardAI.cpp
-      AI/ScriptedAI/ScriptedGuardAI.h
-      AI/ScriptedAI/ScriptedInstance.h
-      AI/ScriptedAI/ScriptedSimpleAI.cpp
-      AI/ScriptedAI/ScriptedSimpleAI.h
-   )
-   message("-- Added Script Engine to GAME lib")
-endif(NOT DO_SCRIPTS)
+  set(game_STAT_SRCS ${game_STAT_SRCS}
+    AI/ScriptedAI/ScriptedEscortAI.cpp
+    AI/ScriptedAI/ScriptedEscortAI.h
+    AI/ScriptedAI/ScriptedCreature.cpp
+    AI/ScriptedAI/ScriptedCreature.h
+    AI/ScriptedAI/ScriptedFollowerAI.cpp
+    AI/ScriptedAI/ScriptedFollowerAI.h
+    AI/ScriptedAI/ScriptedGossip.h
+    AI/ScriptedAI/ScriptedGuardAI.cpp
+    AI/ScriptedAI/ScriptedGuardAI.h
+    AI/ScriptedAI/ScriptedInstance.h
+    AI/ScriptedAI/ScriptedSimpleAI.cpp
+    AI/ScriptedAI/ScriptedSimpleAI.h
+  )
+  message("-- Added basic scriptAI-engines to GAME library")
+endif()
 
 add_library(game STATIC ${game_STAT_SRCS})
-ADD_DEPENDENCIES(game revision.h)
 
-# Generate precompiled header
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+add_dependencies(game revision.h)
 
+# Generate precompiled header
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
+endif()
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 02228d49ba9..7d10625e9d6 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -8,7 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-####### scripts ########
 file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp)
 file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp)
 file(GLOB_RECURSE scripts_northrend Northrend/*.cpp)
@@ -17,34 +16,36 @@ file(GLOB_RECURSE scripts_world World/*.cpp)
 file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+  )
+endif()
 
-SET(scripts_STAT_SRCS
-   ../game/PrecompiledHeaders/ScriptPCH.cpp
-   ../game/PrecompiledHeaders/ScriptPCH.h
-   ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
-   ../game/AI/ScriptedAI/ScriptedEscortAI.h
-   ../game/AI/ScriptedAI/ScriptedCreature.cpp
-   ../game/AI/ScriptedAI/ScriptedCreature.h
-   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
-   ../game/AI/ScriptedAI/ScriptedFollowerAI.h
-   ../game/AI/ScriptedAI/ScriptedGossip.h
-   ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
-   ../game/AI/ScriptedAI/ScriptedGuardAI.h
-   ../game/AI/ScriptedAI/ScriptedInstance.h
-   ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
-   ../game/AI/ScriptedAI/ScriptedSimpleAI.h
-   Custom/on_events.cpp
-   ${scripts_easternkingdoms}
-   ${scripts_kalimdor}
-   ${scripts_northrend}
-   ${scripts_outland}
-   ${scripts_world}
-   ${scripts_examples}
+set(scripts_STAT_SRCS
+  ../game/PrecompiledHeaders/ScriptPCH.cpp
+  ../game/PrecompiledHeaders/ScriptPCH.h
+  ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
+  ../game/AI/ScriptedAI/ScriptedEscortAI.h
+  ../game/AI/ScriptedAI/ScriptedCreature.cpp
+  ../game/AI/ScriptedAI/ScriptedCreature.h
+  ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+  ../game/AI/ScriptedAI/ScriptedFollowerAI.h
+  ../game/AI/ScriptedAI/ScriptedGossip.h
+  ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
+  ../game/AI/ScriptedAI/ScriptedGuardAI.h
+  ../game/AI/ScriptedAI/ScriptedInstance.h
+  ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
+  ../game/AI/ScriptedAI/ScriptedSimpleAI.h
+  Custom/on_events.cpp
+  ${scripts_easternkingdoms}
+  ${scripts_kalimdor}
+  ${scripts_northrend}
+  ${scripts_outland}
+  ${scripts_world}
+  ${scripts_examples}
 )
-message("-- Added Script Engine to SCRIPTS lib")
+message("-- Added Scriptengine to SCRIPTS lib")
 
 include_directories(
   ${ACE_INCLUDE_DIR}
@@ -134,7 +135,8 @@ include_directories(
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  add_precompiled_header(scripts
+    ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h
+  )
+endif()
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 6ff39c724de..c815ddb9902 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -10,27 +10,27 @@
 
 ########### shared ###############
 
-SET(shared_STAT_SRCS
-   Debugging/Errors.h
-   Logging/Log.cpp
-   Logging/Log.h
-   Packets/ByteBuffer.h
-   Packets/WorldPacket.h
-   Policies/ObjectLifeTime.cpp
-   Threading/DelayExecutor.cpp
-   Threading/DelayExecutor.h
-   Threading/Threading.cpp
-   Utilities/ProgressBar.cpp
-   Utilities/ProgressBar.h
-   Utilities/SignalHandler.h
-   Utilities/Timer.h
-   Utilities/Util.cpp
-   Utilities/Util.h  
-   Utilities/EventProcessor.cpp
-   Utilities/EventProcessor.h
-   Common.cpp
-   Common.h
-   SystemConfig.h
+set(shared_STAT_SRCS
+  Debugging/Errors.h
+  Logging/Log.cpp
+  Logging/Log.h
+  Packets/ByteBuffer.h
+  Packets/WorldPacket.h
+  Policies/ObjectLifeTime.cpp
+  Threading/DelayExecutor.cpp
+  Threading/DelayExecutor.h
+  Threading/Threading.cpp
+  Utilities/ProgressBar.cpp
+  Utilities/ProgressBar.h
+  Utilities/SignalHandler.h
+  Utilities/Timer.h
+  Utilities/Util.cpp
+  Utilities/Util.h  
+  Utilities/EventProcessor.cpp
+  Utilities/EventProcessor.h
+  Common.cpp
+  Common.h
+  SystemConfig.h
 )
 
 include_directories(
@@ -56,22 +56,22 @@ include_directories(
 )
 
 add_library(shared STATIC ${shared_STAT_SRCS})
+
 target_link_libraries(
-shared
-${ACE_LIBRARY}
+  shared
+  ${ACE_LIBRARY}
 )
 
-
 ########### trinityconfig ###############
 
-SET(trinityconfig_STAT_SRCS
-   Configuration/dotconfpp/dotconfpp.cpp
-   Configuration/dotconfpp/dotconfpp.h
-   Configuration/dotconfpp/mempool.cpp
-   Configuration/dotconfpp/mempool.h
-   Configuration/Config.cpp
-   Configuration/Config.h
-   Configuration/ConfigEnv.h
+set(trinityconfig_STAT_SRCS
+  Configuration/dotconfpp/dotconfpp.cpp
+  Configuration/dotconfpp/dotconfpp.h
+  Configuration/dotconfpp/mempool.cpp
+  Configuration/dotconfpp/mempool.h
+  Configuration/Config.cpp
+  Configuration/Config.h
+  Configuration/ConfigEnv.h
 )
 
 include_directories(
@@ -84,19 +84,19 @@ add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
 
 ########### trinityauth ###############
 
-SET(trinityauth_STAT_SRCS
-   Cryptography/Authentication/AuthCrypt.cpp
-   Cryptography/Authentication/AuthCrypt.h
-   Cryptography/BigNumber.cpp
-   Cryptography/BigNumber.h
-   Cryptography/HMACSHA1.cpp
-   Cryptography/HMACSHA1.h
-   Cryptography/SHA1.cpp
-   Cryptography/SHA1.h
-   Cryptography/MD5.c
-   Cryptography/MD5.h
-   Cryptography/ARC4.cpp
-   Cryptography/ARC4.h
+set(trinityauth_STAT_SRCS
+  Cryptography/Authentication/AuthCrypt.cpp
+  Cryptography/Authentication/AuthCrypt.h
+  Cryptography/BigNumber.cpp
+  Cryptography/BigNumber.h
+  Cryptography/HMACSHA1.cpp
+  Cryptography/HMACSHA1.h
+  Cryptography/SHA1.cpp
+  Cryptography/SHA1.h
+  Cryptography/MD5.c
+  Cryptography/MD5.h
+  Cryptography/ARC4.cpp
+  Cryptography/ARC4.h
 )
 
 include_directories(
@@ -110,24 +110,24 @@ add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
 
 ########### trinitydatabase ###############
 
-SET(trinitydatabase_STAT_SRCS
-    DataStores/DBCFileLoader.cpp
-    DataStores/DBCFileLoader.h
-    DataStores/DBCStore.h
-    Database/Database.cpp
-    Database/Database.h
-    Database/DatabaseEnv.h
-    Database/DatabaseImpl.h
-    Database/Field.cpp
-    Database/Field.h
-    Database/QueryResult.cpp
-    Database/QueryResult.h
-    Database/SQLStorage.cpp
-    Database/SQLStorage.h
-    Database/SqlDelayThread.cpp
-    Database/SqlDelayThread.h
-    Database/SqlOperations.cpp
-    Database/SqlOperations.h
+set(trinitydatabase_STAT_SRCS
+  DataStores/DBCFileLoader.cpp
+  DataStores/DBCFileLoader.h
+  DataStores/DBCStore.h
+  Database/Database.cpp
+  Database/Database.h
+  Database/DatabaseEnv.h
+  Database/DatabaseImpl.h
+  Database/Field.cpp
+  Database/Field.h
+  Database/QueryResult.cpp
+  Database/QueryResult.h
+  Database/SQLStorage.cpp
+  Database/SQLStorage.h
+  Database/SqlDelayThread.cpp
+  Database/SqlDelayThread.h
+  Database/SqlOperations.cpp
+  Database/SqlOperations.h
 )
 
 include_directories(
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 6b496aa7794..973cdaec200 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -10,7 +10,7 @@
 
 ########### worldserver ###############
 
-SET(worldserver_SRCS
+set(worldserver_SRCS
   CommandLine/CliRunnable.cpp
   CommandLine/CliRunnable.h
   RemoteAccess/RASocket.cpp
@@ -119,53 +119,71 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread
 )
 
-SET(worldserver_LINK_FLAGS "")
+set(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
   -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
 
-SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
+set(worldserver_LINK_FLAGS
+  "-pthread ${worldserver_LINK_FLAGS}"
+)
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
-  SET(SCRIPT_LIB "")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+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}")
+set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
 if(DO_SCRIPTS)
-  SET(SCRIPT_LIB "scripts")
+  set(SCRIPT_LIB "scripts")
 else(DO_SCRIPTS)
-  SET(SCRIPT_LIB "")
+  set(SCRIPT_LIB "")
 endif(DO_SCRIPTS)
-
-target_link_libraries(
-  worldserver
-  game
-  shared
-  zlib
-  trinitysockets
-  trinitydatabase
-  trinityauth
-  trinityconfig
-  collision
-  g3dlib
-  jemalloc
-  ${SCRIPT_LIB}
-  ${READLINE_LIBRARY}
-  ${TERMCAP_LIBRARY}
-  ${ACE_LIBRARY}
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${ZLIB} 
-  ${OSX_LIBS}
-)
-
-install(TARGETS worldserver DESTINATION bin)
+if(WIN32)
+ target_link_libraries(
+    worldserver
+    game
+    shared
+    zlib
+    trinitysockets
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    collision
+    g3dlib
+    jemalloc
+    ${SCRIPT_LIB}
+    ${ACE_LIBRARY}
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_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()
 
 ########### install files ###############
 
-install(FILES  worldserver.conf.dist DESTINATION etc)
-
+install(TARGETS worldserver DESTINATION bin)
+install(FILES   worldserver.conf.dist DESTINATION etc)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index f960329674f..4121a9579ec 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 8e7fa0df891..ce5e54ac4f0 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -28,7 +28,15 @@ add_library(loadlib
   ${loadlib_sources}
 )
 
-target_link_libraries(loadlib zlib)
+if(NOT UNIX)
+  target_link_libraries(loadlib
+    zlib
+  )
+else()
+  target_link_libraries(loadlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 add_library(libmpq
   ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
@@ -43,10 +51,18 @@ add_executable(mapextractor
   ${sources}
 )
 
-target_link_libraries(mapextractor
-  libmpq
-  loadlib
-  bzip2
-)
+if(WIN32)
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    bzip2
+  )
+else()
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    ${BZIP2_LIBRARIES}
+  )
+endif()
 
 install(TARGETS mapextractor DESTINATION bin)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 4b86c1ffa16..0b8ece2dc37 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -10,16 +10,31 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
-  ${ACE_INCLUDE_DIR}
 )
 
 add_definitions(-DNO_CORE_FUNCS)
+
 add_executable(vmap3assembler VMapAssembler.cpp)
-target_link_libraries(vmap3assembler collision g3dlib)
+
+if(WIN32)
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3assembler DESTINATION bin)
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 02d044cdaa9..c159c6fd715 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# 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
@@ -9,9 +9,24 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+file(GLOB sources *.cpp)
+
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-add_executable(vmap3extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmap3extractor libmpq bzip2 zlib)
+add_executable(vmap3extractor ${sources})
+
+if(WIN32)
+  target_link_libraries(vmap3extractor
+    libmpq
+    bzip2
+    zlib
+  )
+else()
+  target_link_libraries(vmap3extractor
+    libmpq
+    ${BZIP2_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3extractor DESTINATION bin)
-- 
cgit v1.2.3


From c9b20170a34feeaae4d57c6feba374b653223824 Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Tue, 22 Jun 2010 02:53:04 +0200
Subject: Cleanup of logging - removed a few duplicit functions from olden
 times, fixed a typo.

--HG--
branch : trunk
---
 src/server/game/AI/ScriptedAI/ScriptedCreature.cpp |  8 +--
 src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 36 +++++-----
 .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp      | 20 +++---
 src/server/game/AI/ScriptedAI/ScriptedInstance.h   | 10 +--
 src/server/game/Instances/InstanceData.cpp         |  8 +--
 src/server/game/Scripting/ScriptMgr.cpp            | 54 +++++++--------
 src/server/game/Scripting/ScriptSystem.cpp         | 66 +++++++++----------
 .../BlackrockDepths/blackrock_depths.cpp           |  2 +-
 .../BlackrockDepths/instance_blackrock_depths.cpp  |  4 +-
 .../BlackwingLair/boss_victor_nefarius.cpp         |  2 +-
 .../Karazhan/boss_shade_of_aran.cpp                |  2 +-
 .../EasternKingdoms/Karazhan/bosses_opera.cpp      |  6 +-
 .../scripts/EasternKingdoms/Karazhan/karazhan.cpp  |  8 +--
 .../scripts/EasternKingdoms/Karazhan/karazhan.h    |  2 +-
 .../MagistersTerrace/boss_selin_fireheart.cpp      |  8 +--
 .../instance_magisters_terrace.cpp                 |  2 +-
 .../EasternKingdoms/ScarletEnclave/chapter1.cpp    | 12 ++--
 .../Stratholme/instance_stratholme.cpp             | 14 ++--
 .../SunwellPlateau/boss_brutallus.cpp              |  6 +-
 .../SunwellPlateau/boss_kalecgos.cpp               |  2 +-
 .../SunwellPlateau/boss_kiljaeden.cpp              |  4 +-
 .../SunwellPlateau/instance_sunwell_plateau.cpp    |  2 +-
 .../EasternKingdoms/Uldaman/boss_archaedas.cpp     |  8 +--
 .../EasternKingdoms/Uldaman/instance_uldaman.cpp   |  2 +-
 .../EasternKingdoms/ZulAman/boss_janalai.cpp       |  4 +-
 .../EasternKingdoms/ZulAman/instance_zulaman.cpp   |  8 +--
 .../EasternKingdoms/ZulGurub/boss_arlokk.cpp       |  2 +-
 .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp    |  4 +-
 .../CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp  |  8 +--
 .../BattleForMountHyjal/instance_hyjal.cpp         |  2 +-
 .../CavernsOfTime/DarkPortal/dark_portal.cpp       |  4 +-
 .../DarkPortal/instance_dark_portal.cpp            | 10 +--
 .../instance_old_hillsbrad.cpp                     | 20 +++---
 .../RazorfenKraul/instance_razorfen_kraul.cpp      |  2 +-
 .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp       |  4 +-
 src/server/scripts/Kalimdor/azuremyst_isle.cpp     |  2 +-
 .../scripts/Northrend/Naxxramas/boss_gothik.cpp    |  2 +-
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  |  4 +-
 .../UtgardeKeep/instance_utgarde_keep.cpp          |  2 +-
 .../ShadowLabyrinth/instance_shadow_labyrinth.cpp  |  8 +--
 .../scripts/Outland/BlackTemple/boss_illidan.cpp   |  2 +-
 .../Outland/BlackTemple/boss_shade_of_akama.cpp    | 16 ++---
 .../Outland/BlackTemple/illidari_council.cpp       |  6 +-
 .../Outland/BlackTemple/instance_black_temple.cpp  |  2 +-
 .../SteamVault/instance_steam_vault.cpp            |  4 +-
 .../instance_hellfire_ramparts.cpp                 |  2 +-
 .../Outland/TempestKeep/Eye/boss_kaelthas.cpp      |  6 +-
 src/server/scripts/Outland/hellfire_peninsula.cpp  |  2 +-
 src/server/scripts/Outland/netherstorm.cpp         |  2 +-
 src/server/scripts/World/go_scripts.cpp            |  2 +-
 src/server/scripts/World/item_scripts.cpp          |  2 +-
 src/server/scripts/World/npc_professions.cpp       |  2 +-
 src/server/scripts/World/npcs_special.cpp          |  8 +--
 src/server/shared/Logging/Log.cpp                  | 76 +---------------------
 src/server/shared/Logging/Log.h                    |  6 --
 55 files changed, 216 insertions(+), 296 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index a10d576e309..9ab9e06b624 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -153,7 +153,7 @@ void ScriptedAI::DoPlaySoundToSet(WorldObject* pSource, uint32 uiSoundId)
 
     if (!GetSoundEntriesStore()->LookupEntry(uiSoundId))
     {
-        error_log("TSCR: Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
+        sLog.outError("TSCR: Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
         return;
     }
 
@@ -398,7 +398,7 @@ void ScriptedAI::DoResetThreat()
 {
     if (!me->CanHaveThreatList() || me->getThreatManager().isThreatListEmpty())
     {
-        error_log("TSCR: DoResetThreat called for creature that either cannot have threat list or has empty threat list (me entry = %d)", me->GetEntry());
+        sLog.outError("TSCR: DoResetThreat called for creature that either cannot have threat list or has empty threat list (me entry = %d)", me->GetEntry());
         return;
     }
 
@@ -441,7 +441,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, flo
     if (!pUnit || pUnit->GetTypeId() != TYPEID_PLAYER)
     {
         if (pUnit)
-            error_log("TSCR: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", me->GetGUID(), me->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
+            sLog.outError("TSCR: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", me->GetGUID(), me->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
         return;
     }
 
@@ -578,7 +578,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff)
                 return false;
             break;
         default:
-            error_log("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition.", me->GetEntry());
+            sLog.outError("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition.", me->GetEntry());
             return false;
     }
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index 217dd066310..0549858d1c7 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -177,7 +177,7 @@ void npc_escortAI::EnterEvadeMode()
     {
         AddEscortState(STATE_ESCORT_RETURNING);
         ReturnToLastPoint();
-        debug_log("TSCR: EscortAI has left combat and is now returning to last point");
+        sLog.outDebug("TSCR: EscortAI has left combat and is now returning to last point");
     }
     else
     {
@@ -224,7 +224,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
             {
                 if (DespawnAtEnd)
                 {
-                    debug_log("TSCR: EscortAI reached end of waypoints");
+                    sLog.outDebug("TSCR: EscortAI reached end of waypoints");
 
                     if (m_bCanReturnToStart)
                     {
@@ -235,7 +235,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
 
                         m_uiWPWaitTimer = 0;
 
-                        debug_log("TSCR: EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
+                        sLog.outDebug("TSCR: EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
                         return;
                     }
 
@@ -251,7 +251,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
                 }
                 else
                 {
-                    debug_log("TSCR: EscortAI reached end of waypoints with Despawn off");
+                    sLog.outDebug("TSCR: EscortAI reached end of waypoints with Despawn off");
 
                     return;
                 }
@@ -260,7 +260,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
             if (!HasEscortState(STATE_ESCORT_PAUSED))
             {
                 me->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
-                debug_log("TSCR: EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
+                sLog.outDebug("TSCR: EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
 
                 WaypointStart(CurrentWP->id);
 
@@ -278,7 +278,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
         {
             if (DespawnAtFar && !IsPlayerOrGroupInRange())
             {
-                debug_log("TSCR: EscortAI failed because player/group was to far away or not found");
+                sLog.outDebug("TSCR: EscortAI failed because player/group was to far away or not found");
 
                 if (m_bCanInstantRespawn)
                 {
@@ -316,7 +316,7 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
     //Combat start position reached, continue waypoint movement
     if (uiPointId == POINT_LAST_POINT)
     {
-        debug_log("TSCR: EscortAI has returned to original position before combat");
+        sLog.outDebug("TSCR: EscortAI has returned to original position before combat");
 
         if (m_bIsRunning && me->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
             me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -330,7 +330,7 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
     }
     else if (uiPointId == POINT_HOME)
     {
-        debug_log("TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
+        sLog.outDebug("TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
 
         CurrentWP = WaypointList.begin();
         m_uiWPWaitTimer = 1;
@@ -340,11 +340,11 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
         //Make sure that we are still on the right waypoint
         if (CurrentWP->id != uiPointId)
         {
-            error_log("TSCR ERROR: EscortAI reached waypoint out of order %u, expected %u, creature entry %u", uiPointId, CurrentWP->id, me->GetEntry());
+            sLog.outError("TSCR ERROR: EscortAI reached waypoint out of order %u, expected %u, creature entry %u", uiPointId, CurrentWP->id, me->GetEntry());
             return;
         }
 
-        debug_log("TSCR: EscortAI Waypoint %u reached", CurrentWP->id);
+        sLog.outDebug("TSCR: EscortAI Waypoint %u reached", CurrentWP->id);
 
         //Call WP function
         WaypointReached(CurrentWP->id);
@@ -415,14 +415,14 @@ void npc_escortAI::SetRun(bool bRun)
         if (!m_bIsRunning)
             me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         else
-            debug_log("TSCR: EscortAI attempt to set run mode, but is already running.");
+            sLog.outDebug("TSCR: EscortAI attempt to set run mode, but is already running.");
     }
     else
     {
         if (m_bIsRunning)
             me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         else
-            debug_log("TSCR: EscortAI attempt to set walk mode, but is already walking.");
+            sLog.outDebug("TSCR: EscortAI attempt to set walk mode, but is already walking.");
     }
     m_bIsRunning = bRun;
 }
@@ -432,13 +432,13 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
 {
     if (me->getVictim())
     {
-        error_log("TSCR ERROR: EscortAI attempt to Start while in combat. Scriptname: %s, creature entry: %u", me->GetScriptName().c_str(), me->GetEntry());
+        sLog.outError("TSCR ERROR: EscortAI attempt to Start while in combat. Scriptname: %s, creature entry: %u", me->GetScriptName().c_str(), me->GetEntry());
         return;
     }
 
     if (HasEscortState(STATE_ESCORT_ESCORTING))
     {
-        error_log("TSCR: EscortAI attempt to Start while already escorting.");
+        sLog.outError("TSCR: EscortAI attempt to Start while already escorting.");
         return;
     }
 
@@ -454,7 +454,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
 
     if (WaypointList.empty())
     {
-        error_db_log("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", pQuest ? pQuest->GetQuestId() : 0);
+        sLog.outErrorDb("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", pQuest ? pQuest->GetQuestId() : 0);
         return;
     }
 
@@ -469,19 +469,19 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
     m_bCanReturnToStart = bCanLoopPath;
 
     if (m_bCanReturnToStart && m_bCanInstantRespawn)
-        debug_log("TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
+        sLog.outDebug("TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
 
     if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
     {
         me->GetMotionMaster()->MovementExpired();
         me->GetMotionMaster()->MoveIdle();
-        debug_log("TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
+        sLog.outDebug("TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
     }
 
     //disable npcflags
     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
 
-    debug_log("TSCR: EscortAI started with %u waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = %u", WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
+    sLog.outDebug("TSCR: EscortAI started with %u waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = %u", WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
 
     CurrentWP = WaypointList.begin();
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index b4a51f9eb27..6147edac45c 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -164,7 +164,7 @@ void FollowerAI::EnterEvadeMode()
 
     if (HasFollowState(STATE_FOLLOW_INPROGRESS))
     {
-        debug_log("TSCR: FollowerAI left combat, returning to CombatStartPosition.");
+        sLog.outDebug("TSCR: FollowerAI left combat, returning to CombatStartPosition.");
 
         if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
         {
@@ -190,7 +190,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
         {
             if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT))
             {
-                debug_log("TSCR: FollowerAI is set completed, despawns.");
+                sLog.outDebug("TSCR: FollowerAI is set completed, despawns.");
                 me->ForcedDespawn();
                 return;
             }
@@ -201,7 +201,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
             {
                 if (HasFollowState(STATE_FOLLOW_RETURNING))
                 {
-                    debug_log("TSCR: FollowerAI is returning to leader.");
+                    sLog.outDebug("TSCR: FollowerAI is returning to leader.");
 
                     RemoveFollowState(STATE_FOLLOW_RETURNING);
                     me->GetMotionMaster()->MoveFollow(pPlayer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
@@ -230,7 +230,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
 
             if (bIsMaxRangeExceeded)
             {
-                debug_log("TSCR: FollowerAI failed because player/group was to far away or not found");
+                sLog.outDebug("TSCR: FollowerAI failed because player/group was to far away or not found");
                 me->ForcedDespawn();
                 return;
             }
@@ -273,13 +273,13 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
 {
     if (me->getVictim())
     {
-        debug_log("TSCR: FollowerAI attempt to StartFollow while in combat.");
+        sLog.outDebug("TSCR: FollowerAI attempt to StartFollow while in combat.");
         return;
     }
 
     if (HasFollowState(STATE_FOLLOW_INPROGRESS))
     {
-        error_log("TSCR: FollowerAI attempt to StartFollow while already following.");
+        sLog.outError("TSCR: FollowerAI attempt to StartFollow while already following.");
         return;
     }
 
@@ -295,7 +295,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
     {
         me->GetMotionMaster()->Clear();
         me->GetMotionMaster()->MoveIdle();
-        debug_log("TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
+        sLog.outDebug("TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
     }
 
     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
@@ -304,7 +304,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
 
     me->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
 
-    debug_log("TSCR: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);
+    sLog.outDebug("TSCR: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);
 }
 
 Player* FollowerAI::GetLeaderForFollower()
@@ -323,7 +323,7 @@ Player* FollowerAI::GetLeaderForFollower()
 
                     if (pMember && pMember->isAlive() && me->IsWithinDistInMap(pMember, MAX_PLAYER_DISTANCE))
                     {
-                        debug_log("TSCR: FollowerAI GetLeader changed and returned new leader.");
+                        sLog.outDebug("TSCR: FollowerAI GetLeader changed and returned new leader.");
                         m_uiLeaderGUID = pMember->GetGUID();
                         return pMember;
                         break;
@@ -333,7 +333,7 @@ Player* FollowerAI::GetLeaderForFollower()
         }
     }
 
-    debug_log("TSCR: FollowerAI GetLeader can not find suitable leader.");
+    sLog.outDebug("TSCR: FollowerAI GetLeader can not find suitable leader.");
     return NULL;
 }
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedInstance.h b/src/server/game/AI/ScriptedAI/ScriptedInstance.h
index 25593e05300..8a9b8c4c5a3 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedInstance.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedInstance.h
@@ -8,11 +8,11 @@
 #include "InstanceData.h"
 #include "Map.h"
 
-#define OUT_SAVE_INST_DATA             debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_SAVE_INST_DATA_COMPLETE    debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_LOAD_INST_DATA(a)          debug_log("TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
-#define OUT_LOAD_INST_DATA_COMPLETE    debug_log("TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_LOAD_INST_DATA_FAIL        error_log("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_SAVE_INST_DATA             sLog.outDebug("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_SAVE_INST_DATA_COMPLETE    sLog.outDebug("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA(a)          sLog.outDebug("TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
+#define OUT_LOAD_INST_DATA_COMPLETE    sLog.outDebug("TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA_FAIL        sLog.outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
 
 #define ScriptedInstance InstanceData
 
diff --git a/src/server/game/Instances/InstanceData.cpp b/src/server/game/Instances/InstanceData.cpp
index 5392ad4cbd1..7408efe97e5 100644
--- a/src/server/game/Instances/InstanceData.cpp
+++ b/src/server/game/Instances/InstanceData.cpp
@@ -43,7 +43,7 @@ void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
     if (go)
         go->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
     else
-        debug_log("TSCR: InstanceData: HandleGameObject failed");
+        sLog.outDebug("TSCR: InstanceData: HandleGameObject failed");
 }
 
 bool InstanceData::IsEncounterInProgress() const
@@ -263,7 +263,7 @@ void InstanceData::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, bo
                 pGo->ResetDoorOrButton();
         }
         else
-            error_log("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType());
+            sLog.outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType());
     }
 }
 
@@ -294,7 +294,7 @@ void InstanceData::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
                 pPlayer->SendUpdateWorldState(uiStateId, uiStateData);
     }
     else
-        debug_log("TSCR: DoUpdateWorldState attempt send data but no players in map.");
+        sLog.outDebug("TSCR: DoUpdateWorldState attempt send data but no players in map.");
 }
 
 // Send Notify to all players in instance
@@ -318,7 +318,7 @@ void InstanceData::DoCompleteAchievement(uint32 achievement)
 
     if (!pAE)
     {
-        error_log("TSCR: DoCompleteAchievement called for not existing achievement %u", achievement);
+        sLog.outError("TSCR: DoCompleteAchievement called for not existing achievement %u", achievement);
         return;
     }
 
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index b41f6a215f8..88e5b7284c0 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -45,22 +45,22 @@ ScriptMgr::~ScriptMgr()
 void ScriptMgr::ScriptsInit()
 {
     //Trinity Script startup
-    /*outstring_log(" _____     _       _ _         ____            _       _");
-    outstring_log("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
-    outstring_log("  | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|");
-    outstring_log("  | || |  | | | | | | |_| |_| |___) | (__| |  | | |_) | |_ ");
-    outstring_log("  |_||_|  |_|_| |_|_|\\__|\\__, |____/ \\___|_|  |_| .__/ \\__|");
-    outstring_log("                         |___/                  |_|        ");
-    outstring_log("");
-    outstring_log("");*/
+    /*sLog.outString(" _____     _       _ _         ____            _       _");
+    sLog.outString("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
+    sLog.outString("  | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|");
+    sLog.outString("  | || |  | | | | | | |_| |_| |___) | (__| |  | | |_) | |_ ");
+    sLog.outString("  |_||_|  |_|_| |_|_|\\__|\\__, |____/ \\___|_|  |_| .__/ \\__|");
+    sLog.outString("                         |___/                  |_|        ");
+    sLog.outString("");
+    sLog.outString("");*/
 
     //Load database (must be called after SD2Config.SetSource).
     LoadDatabase();
 
-    outstring_log("Loading C++ scripts");
+    sLog.outString("Loading C++ scripts");
     barGoLink bar(1);
     bar.step();
-    outstring_log("");
+    sLog.outString("");
 
     for (uint16 i =0; i<MAX_SCRIPTS; ++i)
         m_scripts[i]=NULL;
@@ -69,9 +69,9 @@ void ScriptMgr::ScriptsInit()
 
     AddScripts();
 
-    outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);
+    sLog.outString(">> Loaded %i C++ Scripts.", num_sc_scripts);
 
-    outstring_log(">> Load Overriden SQL Data.");
+    sLog.outString(">> Load Overriden SQL Data.");
     LoadOverridenSQLData();
 }
 
@@ -82,13 +82,13 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 {
     if (!pSource)
     {
-        error_log("TSCR: DoScriptText entry %i, invalid Source pointer.", iTextEntry);
+        sLog.outError("TSCR: DoScriptText entry %i, invalid Source pointer.", iTextEntry);
         return;
     }
 
     if (iTextEntry >= 0)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+        sLog.outError("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
@@ -96,11 +96,11 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 
     if (!pData)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+        sLog.outError("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
-    debug_log("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", iTextEntry, pData->uiSoundId, pData->uiType, pData->uiLanguage, pData->uiEmote);
+    sLog.outDebug("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", iTextEntry, pData->uiSoundId, pData->uiType, pData->uiLanguage, pData->uiEmote);
 
     if (pData->uiSoundId)
     {
@@ -109,7 +109,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
             pSource->SendPlaySound(pData->uiSoundId, false);
         }
         else
-            error_log("TSCR: DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->uiSoundId);
+            sLog.outError("TSCR: DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->uiSoundId);
     }
 
     if (pData->uiEmote)
@@ -117,7 +117,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
         if (pSource->GetTypeId() == TYPEID_UNIT || pSource->GetTypeId() == TYPEID_PLAYER)
             ((Unit*)pSource)->HandleEmoteCommand(pData->uiEmote);
         else
-            error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", iTextEntry, pSource->GetTypeId());
+            sLog.outError("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", iTextEntry, pSource->GetTypeId());
     }
 
     switch(pData->uiType)
@@ -139,7 +139,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
                 if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
                     pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID());
                 else
-                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
+                    sLog.outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }
             break;
         case CHAT_TYPE_BOSS_WHISPER:
@@ -147,7 +147,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
                 if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
                     pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true);
                 else
-                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
+                    sLog.outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }
             break;
         case CHAT_TYPE_ZONE_YELL:
@@ -165,7 +165,7 @@ void Script::RegisterSelf()
         // somebody forgot to allocate memory for a script by a method like this: newscript = new Script
         if (m_scripts[i] == this)
         {
-            error_log("ScriptName: '%s' - Forgot to allocate memory, so this script and/or the script before that can't work.", Name.c_str());
+            sLog.outError("ScriptName: '%s' - Forgot to allocate memory, so this script and/or the script before that can't work.", Name.c_str());
             // don't register it
             // and don't delete it because its memory is used for another script
             return;
@@ -200,14 +200,14 @@ void Script::RegisterSelf()
         else
         {
             // TODO: write a better error message than this one :)
-            error_log("ScriptName: '%s' already assigned with the same ScriptName, so the script can't work.", Name.c_str());
+            sLog.outError("ScriptName: '%s' already assigned with the same ScriptName, so the script can't work.", Name.c_str());
             delete this;
         }
     }
     else
     {
         if (Name.find("example") == std::string::npos)
-            error_db_log("TrinityScript: RegisterSelf, but script named %s does not have ScriptName assigned in database.",(this)->Name.c_str());
+            sLog.outErrorDb("TrinityScript: RegisterSelf, but script named %s does not have ScriptName assigned in database.",(this)->Name.c_str());
         delete this;
     }
 }
@@ -326,7 +326,7 @@ bool ScriptMgr::GossipHello (Player * pPlayer, Creature* pCreature)
 
 bool ScriptMgr::GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
 {
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pCreature->GetScriptId()];
     if (!tmpscript || !tmpscript->pGossipSelect) return false;
@@ -337,7 +337,7 @@ bool ScriptMgr::GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSend
 
 bool ScriptMgr::GossipSelectWithCode(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction, const char* sCode)
 {
-    debug_log("TSCR: Gossip selection with code, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection with code, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pCreature->GetScriptId()];
     if (!tmpscript || !tmpscript->pGossipSelectWithCode) return false;
@@ -350,7 +350,7 @@ bool ScriptMgr::GOSelect(Player* pPlayer, GameObject* pGO, uint32 uiSender, uint
 {
     if (!pGO)
     return false;
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId];
     if (!tmpscript || !tmpscript->pGOSelect) return false;
@@ -363,7 +363,7 @@ bool ScriptMgr::GOSelectWithCode(Player* pPlayer, GameObject* pGO, uint32 uiSend
 {
     if (!pGO)
     return false;
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d",uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d",uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId];
     if (!tmpscript || !tmpscript->pGOSelectWithCode) return false;
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index fcd5c81add4..54a14228bc1 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -43,24 +43,24 @@ void SystemMgr::LoadVersion()
     {
         Field* pFields = Result->Fetch();
 
-        outstring_log("TSCR: Database version is: %s", pFields[0].GetString());
-        outstring_log("");
+        sLog.outString("TSCR: Database version is: %s", pFields[0].GetString());
+        sLog.outString("");
     }
     else
     {
-        error_log("TSCR: Missing `version`.`script_version` information.");
-        outstring_log("");
+        sLog.outError("TSCR: Missing `version`.`script_version` information.");
+        sLog.outString("");
     }
 }
 
 void SystemMgr::LoadScriptTexts()
 {
-    outstring_log("TSCR: Loading Script Texts...");
+    sLog.outString("TSCR: Loading Script Texts...");
     LoadTrinityStrings(WorldDatabase,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
 
     QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
 
-    outstring_log("TSCR: Loading Script Texts additional data...");
+    sLog.outString("TSCR: Loading Script Texts additional data...");
 
     if (Result)
     {
@@ -81,52 +81,52 @@ void SystemMgr::LoadScriptTexts()
 
             if (iId >= 0)
             {
-                error_db_log("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
                 continue;
             }
 
             if (iId > TEXT_SOURCE_RANGE || iId <= TEXT_SOURCE_RANGE*2)
             {
-                error_db_log("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
                 continue;
             }
 
             if (pTemp.uiSoundId)
             {
                 if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                    error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                    sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
             }
 
             if (!GetLanguageDescByID(pTemp.uiLanguage))
-                error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
             if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
             m_mTextDataMap[iId] = pTemp;
             ++uiCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u additional Script Texts data.", uiCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u additional Script Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
     }
 }
 
 void SystemMgr::LoadScriptTextsCustom()
 {
-    outstring_log("TSCR: Loading Custom Texts...");
+    sLog.outString("TSCR: Loading Custom Texts...");
     LoadTrinityStrings(WorldDatabase,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
 
     QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts");
 
-    outstring_log("TSCR: Loading Custom Texts additional data...");
+    sLog.outString("TSCR: Loading Custom Texts additional data...");
 
     if (Result)
     {
@@ -147,41 +147,41 @@ void SystemMgr::LoadScriptTextsCustom()
 
             if (iId >= 0)
             {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
                 continue;
             }
 
             if (iId > TEXT_SOURCE_RANGE*2 || iId <= TEXT_SOURCE_RANGE*3)
             {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
                 continue;
             }
 
             if (pTemp.uiSoundId)
             {
                 if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                    error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                    sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
             }
 
             if (!GetLanguageDescByID(pTemp.uiLanguage))
-                error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
             if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
             m_mTextDataMap[iId] = pTemp;
             ++uiCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u additional Custom Texts data.", uiCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u additional Custom Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
     }
 }
 
@@ -197,7 +197,7 @@ void SystemMgr::LoadScriptWaypoints()
     if (Result)
         uiCreatureCount = Result->GetRowCount();
 
-    outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
+    sLog.outString("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
 
     Result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 
@@ -224,25 +224,25 @@ void SystemMgr::LoadScriptWaypoints()
 
             if (!pCInfo)
             {
-                error_db_log("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
+                sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
                 continue;
             }
 
             if (!pCInfo->ScriptID)
-                error_db_log("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
+                sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
 
             m_mPointMoveMap[uiEntry].push_back(pTemp);
             ++uiNodeCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
     }
 }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 09ed6a1c4b0..a27f28e8d9c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -214,7 +214,7 @@ struct npc_grimstoneAI : public npc_escortAI
             if (pInstance)
             {
                 pInstance->SetData(TYPE_RING_OF_LAW,DONE);
-                debug_log("TSCR: npc_grimstone: event reached end and set complete.");
+                sLog.outDebug("TSCR: npc_grimstone: event reached end and set complete.");
             }
             break;
         }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 6c865ee214d..3dd048ce449 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -207,7 +207,7 @@ struct instance_blackrock_depths : public ScriptedInstance
 
     void SetData64(uint32 type, uint64 data)
     {
-        debug_log("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data %u)", type, data);
+        sLog.outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data %u)", type, data);
 
         switch(type)
         {
@@ -223,7 +223,7 @@ struct instance_blackrock_depths : public ScriptedInstance
 
     void SetData(uint32 type, uint32 data)
     {
-        debug_log("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
+        sLog.outDebug("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
 
         switch(type)
         {
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 74d118033c6..b079dd94a58 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -312,7 +312,7 @@ struct boss_victor_nefariusAI : public ScriptedAI
                         Nefarian->setFaction(103);
                         NefarianGUID = Nefarian->GetGUID();
                     }
-                    else error_log("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
+                    else sLog.outError("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
                 }
 
                 AddSpawnTimer = 4000;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index 19bf7d235ed..e7c26491cb0 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -534,7 +534,7 @@ CreatureAI* GetAI_water_elemental(Creature* pCreature)
 // CONVERT TO ACID
 CreatureAI* GetAI_shadow_of_aran(Creature* pCreature)
 {
-    outstring_log("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
+    sLog.outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
     SimpleAI* ai = new SimpleAI (pCreature);
 
     ai->Spell[0].Enabled = true;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 11e87b9e82e..bf4db4d9d01 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1154,7 +1154,7 @@ void boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
 
     if (Phase == PHASE_ROMULO)
     {
-        error_log("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
+        sLog.outError("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
         damage = 0;
         return;
     }
@@ -1188,7 +1188,7 @@ void boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
             return;
         }
     }
-    error_log("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
+    sLog.outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
 }
 
 void boss_romuloAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
@@ -1242,7 +1242,7 @@ void boss_romuloAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
         }
     }
 
-    error_log("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
+    sLog.outError("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
 }
 
 void boss_julianneAI::UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 321a65c2544..a388600b51d 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -220,7 +220,7 @@ struct npc_barnesAI : public npc_escortAI
 
     void PrepareEncounter()
     {
-        debug_log("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
+        sLog.outDebug("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
         uint8 index = 0;
         uint8 count = 0;
 
@@ -371,17 +371,17 @@ bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 /*uiSe
         case GOSSIP_ACTION_INFO_DEF+3:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_OZ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_HOOD;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_RAJ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
             break;
     }
 
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index 56a6b106332..86562fd06df 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -48,6 +48,6 @@ enum OperaEvents
     EVENT_RAJ                       = 3
 };
 
-#define ERROR_INST_DATA(a)          error_log("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
+#define ERROR_INST_DATA(a)          sLog.outError("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
 #endif
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 7dc8db7ce15..15be0f2f87a 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -63,7 +63,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
             for (uint8 i = 0; i < size; ++i)
             {
                 uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
-                debug_log("TSCR: Selin: Adding Fel Crystal %u to list", guid);
+                sLog.outDebug("TSCR: Selin: Adding Fel Crystal %u to list", guid);
                 Crystals.push_back(guid);
             }
         }
@@ -108,7 +108,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
                                                             // Small door opened after event are expected to be closed by default
             // Set Inst data for encounter
             pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
 
         DrainLifeTimer = 3000 + rand()%4000;
         DrainManaTimer = DrainLifeTimer + 5000;
@@ -208,7 +208,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
             else
             {
                 // Make an error message in case something weird happened here
-                error_log("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
+                sLog.outError("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
                 DrainingCrystal = false;
             }
         }
@@ -340,7 +340,7 @@ struct mob_fel_crystalAI : public ScriptedAI
                     }
                 }
             }
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
     }
 };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 715261f8239..ff8b0b88786 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -169,7 +169,7 @@ struct instance_magisters_terrace : public ScriptedInstance
             {
                 if (FelCrystals.empty())
                 {
-                    error_log("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
+                    sLog.outError("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
                     return 0;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index f801f7e872e..9dcfc4ad459 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -199,7 +199,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
                 anchorGUID = anchor->GetGUID();
             }
             else
-                error_log("npc_unworthy_initiateAI: unable to find anchor!");
+                sLog.outError("npc_unworthy_initiateAI: unable to find anchor!");
 
             float dist = 99.0f;
             GameObject *prison = NULL;
@@ -219,7 +219,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
             if (prison)
                 prison->ResetDoorOrButton();
             else
-                error_log("npc_unworthy_initiateAI: unable to find prison!");
+                sLog.outError("npc_unworthy_initiateAI: unable to find prison!");
         }
         return;
     case PHASE_TO_EQUIP:
@@ -230,7 +230,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
             else
             {
                 me->GetMotionMaster()->MovePoint(1, anchorX, anchorY, me->GetPositionZ());
-                //debug_log("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
+                //sLog.outDebug("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
                 phase = PHASE_EQUIPING;
                 wait_timer = 0;
             }
@@ -989,9 +989,9 @@ bool GOHello_go_inconspicuous_mine_car(Player* pPlayer, GameObject* /*pGO*/)
                 {
                     car->AI()->SetGUID(miner->GetGUID());
                     CAST_AI(npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer);
-                } else error_log("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct.");
-            } else error_log("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle.");
-        } else error_log("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script.");
+                } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct.");
+            } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle.");
+        } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script.");
     }
     return true;
 }
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 191be16cd19..ce5794237f1 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -112,7 +112,7 @@ struct instance_stratholme : public ScriptedInstance
             return true;
         }
 
-        debug_log("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
+        sLog.outDebug("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
         return false;
     }
 
@@ -208,7 +208,7 @@ struct instance_stratholme : public ScriptedInstance
                     break;
                 Encounter[0] = data;
                 BaronRun_Timer = 2700000;
-                debug_log("TSCR: Instance Stratholme: Baron run in progress.");
+                sLog.outDebug("TSCR: Instance Stratholme: Baron run in progress.");
                 break;
             case FAIL:
                 //may add code to remove aura from players, but in theory the time should be up already and removed.
@@ -266,10 +266,10 @@ struct instance_stratholme : public ScriptedInstance
                     //UpdateGoState(ziggurat4GUID,0,true);
                     if (Creature* pBaron = instance->GetCreature(baronGUID))
                         pBaron->SummonCreature(C_RAMSTEIN,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
-                    debug_log("TSCR: Instance Stratholme: Ramstein spawned.");
+                    sLog.outDebug("TSCR: Instance Stratholme: Ramstein spawned.");
                 }
                 else
-                    debug_log("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
+                    sLog.outDebug("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
             }
 
             if (data == NOT_STARTED)
@@ -278,7 +278,7 @@ struct instance_stratholme : public ScriptedInstance
             if (data == DONE)
             {
                 SlaugtherSquare_Timer = 300000;
-                debug_log("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
+                sLog.outDebug("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
             }
             Encounter[4] = data;
             break;
@@ -419,7 +419,7 @@ struct instance_stratholme : public ScriptedInstance
                 if (GetData(TYPE_BARON_RUN) != DONE)
                     SetData(TYPE_BARON_RUN, FAIL);
                 BaronRun_Timer = 0;
-                debug_log("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
+                sLog.outDebug("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
             } else BaronRun_Timer -= diff;
         }
 
@@ -434,7 +434,7 @@ struct instance_stratholme : public ScriptedInstance
 
                     HandleGameObject(ziggurat4GUID, true);
                     HandleGameObject(ziggurat5GUID, true);
-                    debug_log("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
+                    sLog.outDebug("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
                 }
                 SlaugtherSquare_Timer = 0;
             } else SlaugtherSquare_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 52ded56c5ae..2bf2967c914 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -143,7 +143,7 @@ struct boss_brutallusAI : public ScriptedAI
     {
         if (!Intro || IsIntro)
             return;
-        error_log("Start Intro");
+        sLog.outError("Start Intro");
         Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0);
         if (Madrigosa)
         {
@@ -158,7 +158,7 @@ struct boss_brutallusAI : public ScriptedAI
         }else
         {
             //Madrigosa not found, end intro
-            error_log("Madrigosa was not found");
+            sLog.outError("Madrigosa was not found");
             EndIntro();
         }
     }
@@ -168,7 +168,7 @@ struct boss_brutallusAI : public ScriptedAI
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         Intro = false;
         IsIntro = false;
-        error_log("End Intro");
+        sLog.outError("End Intro");
     }
 
     void AttackStart(Unit* pWho)
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 3c1ae1a1723..c41b213bd6a 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -260,7 +260,7 @@ struct boss_kalecgosAI : public ScriptedAI
                     }
                     else
                     {
-                        error_log("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
+                        sLog.outError("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
                         EnterEvadeMode();
                         return;
                     }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 7bd3273d9f2..d80153c14f5 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -727,7 +727,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI
                             if (pRandomPlayer)
                                 DoCast(pRandomPlayer, SPELL_LEGION_LIGHTNING, false);
                             else
-                                error_log("try to cast SPELL_LEGION_LIGHTNING on invalid target");
+                                sLog.outError("try to cast SPELL_LEGION_LIGHTNING on invalid target");
                             
                             Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE
                             Timer[TIMER_SOUL_FLAY] = 2500;
@@ -1341,7 +1341,7 @@ struct mob_sinster_reflectionAI : public ScriptedAI
                 DoMeleeAttackIfReady();
                 break;
             }
-            debug_log("Sinister-Timer");
+            sLog.outDebug("Sinister-Timer");
             for (uint8 i = 0; i < 3; ++i)
                 uiTimer[i] -= diff;            
         }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 5ad630840ea..12e94c2f33d 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -110,7 +110,7 @@ struct instance_sunwell_plateau : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index 3641f901453..957dbec7ba5 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -436,7 +436,7 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
 
     //if (altarOfTheKeeperCounter < NUMBER_NEEDED_TO_ACTIVATE)
     //{
-          //error_log("not enough people yet, altarOfTheKeeperCounter = %d", altarOfTheKeeperCounter);
+          //sLog.outError("not enough people yet, altarOfTheKeeperCounter = %d", altarOfTheKeeperCounter);
     //    return false; // not enough people yet
     //}
 /*
@@ -446,7 +446,7 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
     for (uint8 x = 0; x < 5; ++x)
     {
         pTarget = Unit::GetUnit(*pPlayer, altarOfTheKeeperCount[x]);
-        //error_log("number of people currently activating it: %d", x+1);
+        //sLog.outError("number of people currently activating it: %d", x+1);
         if (!pTarget)
             continue;
         if (pTarget->IsNonMeleeSpellCasted(true))
@@ -457,11 +457,11 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
 
     if (count < NUMBER_NEEDED_TO_ACTIVATE)
     {
-        //error_log("still not enough people");
+        //sLog.outError("still not enough people");
         return true; // not enough people
     }
 */
-    //error_log ("activating stone keepers");
+    //sLog.outError ("activating stone keepers");
     pInstance->SetData(NULL,1); // activate the Stone Keepers
     return true;
 }
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 9720d6caa79..f09f9268395 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -215,7 +215,7 @@ struct instance_uldaman : public ScriptedInstance
 
     void SetData (uint32 /*type*/, uint32 data)
     {
-        //error_log ("SetData: data = %d", data);
+        //sLog.outError ("SetData: data = %d", data);
         if (data == 0) OpenDoor (altarOfTheKeeperTempleDoor);
         if (data == 0) OpenDoor (archaedasTempleDoor);
         if (data == 3) OpenDoor (ancientVaultDoor);
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 64ad50ea70f..9ab4937163a 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -242,7 +242,7 @@ struct boss_janalaiAI : public ScriptedAI
             cell.Visit(pair, cSearcher, *(me->GetMap()));
         }
 
-        //error_log("Eggs %d at middle", templist.size());
+        //sLog.outError("Eggs %d at middle", templist.size());
         if (!templist.size())
             return false;
 
@@ -508,7 +508,7 @@ struct mob_amanishi_hatcherAI : public ScriptedAI
             cell.Visit(pair, cSearcher, *(me->GetMap()));
         }
 
-        //error_log("Eggs %d at %d", templist.size(), side);
+        //sLog.outError("Eggs %d at %d", templist.size(), side);
 
         for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
             if ((*i)->GetDisplayId() != 11686)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 4758faf1ddf..1f74fdf4d7f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -172,7 +172,7 @@ struct instance_zulaman : public ScriptedInstance
         ss << "S " << BossKilled << " " << ChestLooted << " " << QuestMinute;
         char* data = new char[ss.str().length()+1];
         strcpy(data, ss.str().c_str());
-        //error_log("TSCR: Zul'aman saved, %s.", data);
+        //sLog.outError("TSCR: Zul'aman saved, %s.", data);
         return data;
     }
 
@@ -180,17 +180,17 @@ struct instance_zulaman : public ScriptedInstance
     {
         if (!load) return;
         std::istringstream ss(load);
-        //error_log("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
+        //sLog.outError("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
         char dataHead; // S
         uint16 data1, data2, data3;
         ss >> dataHead >> data1 >> data2 >> data3;
-        //error_log("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
+        //sLog.outError("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
         if (dataHead == 'S')
         {
             BossKilled = data1;
             ChestLooted = data2;
             QuestMinute = data3;
-        } else error_log("TSCR: Zul'aman: corrupted save data.");
+        } else sLog.outError("TSCR: Zul'aman: corrupted save data.");
     }
 
     void SetData(uint32 type, uint32 data)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index ecc458c19c5..a309028b67d 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -170,7 +170,7 @@ struct boss_arlokkAI : public ScriptedAI
                     MarkedTargetGUID = pMarkedTarget->GetGUID();
                 }
                 else
-                    error_log("TSCR: boss_arlokk could not accuire pMarkedTarget.");
+                    sLog.outError("TSCR: boss_arlokk could not accuire pMarkedTarget.");
 
                 m_uiMark_Timer = 15000;
             }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index c2c040dc696..a72598c0e7d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -105,7 +105,7 @@ bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uin
             break;
          case GOSSIP_ACTION_INFO_DEF:
             ai->Debug = !ai->Debug;
-            debug_log("TSCR: HyjalAI - Debug mode has been toggled");
+            sLog.outDebug("TSCR: HyjalAI - Debug mode has been toggled");
             break;
     }
     return true;
@@ -175,7 +175,7 @@ bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 /*uiSe
             break;
         case GOSSIP_ACTION_INFO_DEF:
             ai->Debug = !ai->Debug;
-            debug_log("TSCR: HyjalAI - Debug mode has been toggled");
+            sLog.outDebug("TSCR: HyjalAI - Debug mode has been toggled");
             break;
     }
     return true;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 6f12692d164..c329c659419 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -400,7 +400,7 @@ void hyjalAI::Reset()
             pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
             pInstance->SetData(DATA_RESET_TRASH_COUNT, 0);
         }
-    } else error_log(ERROR_INST_DATA);
+    } else sLog.outError(ERROR_INST_DATA);
 
     //Visibility
     DoHide = true;
@@ -531,7 +531,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
 
     if (!pInstance)
     {
-        error_log(ERROR_INST_DATA);
+        sLog.outError(ERROR_INST_DATA);
         return;
     }
     InfernalCount = 0;//reset infernal count every new wave
@@ -561,7 +561,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
         else
         {
             NextWaveTimer = 15000;
-            debug_log("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds");
+            sLog.outDebug("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds");
         }
     }
     else
@@ -605,7 +605,7 @@ uint32 hyjalAI::GetInstanceData(uint32 Event)
 {
     if (pInstance)
         return pInstance->GetData(Event);
-    else error_log(ERROR_INST_DATA);
+    else sLog.outError(ERROR_INST_DATA);
 
     return 0;
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 07decc11387..54007a11ecd 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -248,7 +248,7 @@ struct instance_mount_hyjal : public ScriptedInstance
                 break;
         }
 
-         debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data);
+         sLog.outDebug("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data);
 
         if (data == DONE)
         {
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index fdeb56f4c54..b31c265575e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -305,7 +305,7 @@ struct npc_time_riftAI : public ScriptedAI
             mRiftWaveCount = 0;
 
         entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount];
-        debug_log("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry);
+        sLog.outDebug("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry);
 
         ++mRiftWaveCount;
 
@@ -330,7 +330,7 @@ struct npc_time_riftAI : public ScriptedAI
         if (me->IsNonMeleeSpellCasted(false))
             return;
 
-        debug_log("TSCR: npc_time_rift: not casting anylonger, i need to die.");
+        sLog.outDebug("TSCR: npc_time_rift: not casting anylonger, i need to die.");
         me->setDeathState(JUST_DIED);
 
         if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index a98d5f80eee..58120d6dc55 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -178,7 +178,7 @@ struct instance_dark_portal : public ScriptedInstance
             {
                 if (data == IN_PROGRESS)
                 {
-                    debug_log("TSCR: Instance Dark Portal: Starting event.");
+                    sLog.outDebug("TSCR: Instance Dark Portal: Starting event.");
                     InitWorldState();
                     m_auiEncounter[1] = IN_PROGRESS;
                     NextPortal_Timer = 15000;
@@ -187,7 +187,7 @@ struct instance_dark_portal : public ScriptedInstance
                 if (data == DONE)
                 {
                     //this may be completed further out in the post-event
-                    debug_log("TSCR: Instance Dark Portal: Event completed.");
+                    sLog.outDebug("TSCR: Instance Dark Portal: Event completed.");
                     Map::PlayerList const& players = instance->GetPlayers();
 
                     if (!players.isEmpty())
@@ -252,7 +252,7 @@ struct instance_dark_portal : public ScriptedInstance
         if (entry == RIFT_BOSS)
             entry = RandRiftBoss();
 
-        debug_log("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry);
+        sLog.outDebug("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry);
 
         Position pos;
         me->GetRandomNearPosition(pos, 10.0f);
@@ -263,7 +263,7 @@ struct instance_dark_portal : public ScriptedInstance
         if (Creature *summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000))
             return summon;
 
-        debug_log("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun...");
+        sLog.outDebug("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun...");
         return NULL;
     }
 
@@ -276,7 +276,7 @@ struct instance_dark_portal : public ScriptedInstance
             if (tmp >= CurrentRiftId)
                 ++tmp;
 
-            debug_log("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId);
+            sLog.outDebug("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId);
 
             CurrentRiftId = tmp;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 463461dcc1d..c6511af2a65 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -71,7 +71,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
@@ -111,7 +111,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
 
         if (!pPlayer)
         {
-            debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
+            sLog.outDebug("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
             return;
         }
 
@@ -127,7 +127,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
                     ++mBarrelCount;
                     DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount);
 
-                    debug_log("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount);
+                    sLog.outDebug("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount);
 
                     m_auiEncounter[0] = IN_PROGRESS;
 
@@ -148,7 +148,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
                     {
                         ++mThrallEventCount;
                         m_auiEncounter[1] = NOT_STARTED;
-                        debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
+                        sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
                         m_auiEncounter[2] = NOT_STARTED;
                         m_auiEncounter[3] = NOT_STARTED;
                         m_auiEncounter[4] = NOT_STARTED;
@@ -161,29 +161,29 @@ struct instance_old_hillsbrad : public ScriptedInstance
                         m_auiEncounter[3] = data;
                         m_auiEncounter[4] = data;
                         m_auiEncounter[5] = data;
-                        debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
+                        sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
                     }
                 }
                 else
                     m_auiEncounter[1] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data);
                 break;
             }
             case TYPE_THRALL_PART1:
                 m_auiEncounter[2] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART2:
                 m_auiEncounter[3] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART3:
                 m_auiEncounter[4] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART4:
                 m_auiEncounter[5] = data;
-                 debug_log("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data);
+                 sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data);
                 break;
         }
     }
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index eddf965a99e..7ba2ebd5bc2 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -53,7 +53,7 @@ struct instance_razorfen_kraul : public ScriptedInstance
                     return plr;
             }
         }
-        debug_log("TSCR: Instance Razorfen Kraul: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Razorfen Kraul: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 9e53596c9fe..44a6409982a 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -168,7 +168,7 @@ struct eye_of_cthunAI : public Scripted_NoMovementAI
     {
         pInst = c->GetInstanceData();
         if (!pInst)
-            error_log("TSCR: No Instance eye_of_cthunAI");
+            sLog.outError("TSCR: No Instance eye_of_cthunAI");
     }
 
     ScriptedInstance* pInst;
@@ -460,7 +460,7 @@ struct cthunAI : public Scripted_NoMovementAI
 
         pInst = c->GetInstanceData();
         if (!pInst)
-            error_log("TSCR: No Instance eye_of_cthunAI");
+            sLog.outError("TSCR: No Instance eye_of_cthunAI");
     }
 
     ScriptedInstance* pInst;
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 780f1f41f0c..e1a63062439 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -512,7 +512,7 @@ struct npc_geezleAI : public ScriptedAI
                 else
                     (*itr)->Respawn();
             }
-        } else error_log("SD2 ERROR: FlagList is empty!");
+        } else sLog.outError("SD2 ERROR: FlagList is empty!");
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index b815e0172ec..ac774c6512e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -182,7 +182,7 @@ struct boss_gothikAI : public BossAI
 
         if (LiveTriggerGUID.size() < POS_LIVE || DeadTriggerGUID.size() < POS_DEAD)
         {
-            error_log("Script Gothik: cannot summon triggers!");
+            sLog.outError("Script Gothik: cannot summon triggers!");
             EnterEvadeMode();
             return;
         }
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index c238e55675b..37dbce59c74 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -633,7 +633,7 @@ struct dummy_dragonAI : public ScriptedAI
         if (!pInstance || uiType != POINT_MOTION_TYPE)
             return;
 
-        debug_log("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
+        sLog.outDebug("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
 
         //if healers messed up the raid and we was already initialized
         if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
@@ -790,7 +790,7 @@ struct dummy_dragonAI : public ScriptedAI
                     me->GetMotionMaster()->MovePoint(m_uiWaypointId,
                         m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ);
 
-                debug_log("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
+                sLog.outDebug("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
                 m_uiMoveNextTimer = 0;
             }
             else
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index 67fb0a09755..3e39de32fba 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -109,7 +109,7 @@ struct instance_utgarde_keep : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 9b4ecca6579..f3f754ec296 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -96,7 +96,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                 if (pCreature->isAlive())
                 {
                     ++m_uiFelOverseerCount;
-                    debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
+                    sLog.outDebug("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
                 }
                 break;
         }
@@ -113,7 +113,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
             case TYPE_OVERSEER:
                 if (uiData != DONE)
                 {
-                    error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
+                    sLog.outError("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
                     return;
                 }
                 if (m_uiFelOverseerCount)
@@ -121,11 +121,11 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                     --m_uiFelOverseerCount;
 
                     if (m_uiFelOverseerCount)
-                        debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
+                        sLog.outDebug("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
                     else
                     {
                         m_auiEncounter[1] = DONE;
-                        debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
+                        sLog.outDebug("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
                     }
                 }
                 break;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 590e51d9eab..64fed0967d9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -2065,7 +2065,7 @@ void boss_illidan_stormrageAI::SummonMaiev()
     {
         EnterEvadeMode();
         me->MonsterTextEmote(EMOTE_UNABLE_TO_SUMMON, 0);
-        error_log("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
+        sLog.outError("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
     }
 }
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 663faceb672..38ce3f2590d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -276,7 +276,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
                         GridSearcherSucceeded = true;
                     }
                 }
-            } else error_log("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
+            } else sLog.outError("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
         }
     }
 
@@ -293,13 +293,13 @@ struct boss_shade_of_akamaAI : public ScriptedAI
         if (reseting)
             return;
 
-        debug_log("TSCR: Increasing Death Count for Shade of Akama encounter");
+        sLog.outDebug("TSCR: Increasing Death Count for Shade of Akama encounter");
         ++DeathCount;
         me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
         if (guid)
         {
             if (Sorcerers.empty())
-                error_log("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
+                sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
             else  Sorcerers.remove(guid);
         }
     }
@@ -351,17 +351,17 @@ struct boss_shade_of_akamaAI : public ScriptedAI
             {
                 CAST_AI(mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
                 Channelers.push_back((*itr)->GetGUID());
-                debug_log("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
+                sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
             }
         }
-        else error_log("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
+        else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
     }
 
     void SetSelectableChannelers()
     {
         if (Channelers.empty())
         {
-            error_log("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
+            sLog.outError("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
             return;
         }
 
@@ -485,7 +485,7 @@ void mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount();
-    else error_log("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
@@ -493,7 +493,7 @@ void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID());
-    else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 struct npc_akamaAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 132da7d7bd1..52ccd1c6434 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -143,7 +143,7 @@ struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI
             Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW);
             Council[2] = pInstance->GetData64(DATA_LADYMALANDE);
             Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR);
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
     }
 
     void EnterCombat(Unit* /*who*/) {}
@@ -375,7 +375,7 @@ struct boss_illidari_councilAI : public ScriptedAI
         }
         else
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             EnterEvadeMode();
             return;
         }
@@ -423,7 +423,7 @@ struct boss_illidari_councilAI : public ScriptedAI
     {
         if (!pInstance)
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             return;
         }
 
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 5af96257887..384c9b32ff8 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -124,7 +124,7 @@ struct instance_black_temple : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 2669c8ed48d..5d60bc7f3e6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -119,7 +119,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[0] = data;
                 break;
@@ -131,7 +131,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[1] = data;
                 break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 76425e351cf..500892129c2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -51,7 +51,7 @@ struct instance_ramparts : public ScriptedInstance
 
     void SetData(uint32 uiType, uint32 uiData)
     {
-        debug_log("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
+        sLog.outDebug("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
 
         switch(uiType)
         {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 276fe844e32..671821d8924 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -356,7 +356,7 @@ struct boss_kaelthasAI : public ScriptedAI
 
         if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3])
         {
-            error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
+            sLog.outError("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
 
             DoScriptText(SAY_PHASE4_INTRO2, me);
 
@@ -678,7 +678,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]);
 
                         if (!Advisor)
-                            error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
+                            sLog.outError("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
                         else
                             CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget);
                     }
@@ -763,7 +763,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         if (me->getThreatManager().getThreatList().size() >= 2)
                             for (uint32 i = 0; i < 3; ++i)
                         {
-                            debug_log("SD2: Kael'Thas mind control not supported.");
+                            sLog.outDebug("SD2: Kael'Thas mind control not supported.");
                             //DoCast(pUnit, SPELL_MIND_CONTROL);
                         }
 
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index bafca52e463..8c3355d5238 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -140,7 +140,7 @@ struct npc_ancestral_wolfAI : public npc_escortAI
         if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
             Start(false, false, pCreature->GetOwner()->GetGUID());
         else
-            error_log("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
+            sLog.outError("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
 
         pCreature->SetSpeed(MOVE_WALK, 1.5f);
         Reset();
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index a44839eba90..7c5254cace6 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -463,7 +463,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
             return true;
         }
 
-        debug_log("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
+        sLog.outDebug("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
         return false;
     }
 
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index d8dd8c3d391..65e1fc9fb17 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -259,7 +259,7 @@ bool GOHello_go_ethereum_prison(Player *pPlayer, GameObject *pGO)
                 if (Spell)
                     pCreature->CastSpell(pPlayer, Spell, false);
                 else
-                    error_log("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
+                    sLog.outError("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
             }
         }
     }
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index cae4233775b..ccca8ce70af 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -139,7 +139,7 @@ bool ItemUse_item_flying_machine(Player* pPlayer, Item* pItem, SpellCastTargets
         if (pPlayer->GetBaseSkillValue(SKILL_RIDING) == 300)
             return false;
 
-    debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
+    sLog.outDebug("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
     pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,pItem,NULL);
     return true;
 }
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 9d33584847b..5acd8472c44 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -238,7 +238,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
                 if (pItem->GetProto()->RequiredSpell == reqSpell)
             {
                 //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first
-                debug_log("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId);
+                sLog.outDebug("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId);
                 return false;
             }
         }
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 86aaac1413b..625f6485fc6 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -123,7 +123,7 @@ struct npc_air_force_botsAI : public ScriptedAI
         }
 
         if (!m_pSpawnAssoc)
-            error_db_log("TCSR: Creature template entry %u has ScriptName npc_air_force_bots, but it's not handled by that script", pCreature->GetEntry());
+            sLog.outErrorDb("TCSR: Creature template entry %u has ScriptName npc_air_force_bots, but it's not handled by that script", pCreature->GetEntry());
         else
         {
             CreatureInfo const* spawnedTemplate = GetCreatureTemplateStore(m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
@@ -131,7 +131,7 @@ struct npc_air_force_botsAI : public ScriptedAI
             if (!spawnedTemplate)
             {
                 m_pSpawnAssoc = NULL;
-                error_db_log("TCSR: Creature template entry %u does not exist in DB, which is required by npc_air_force_bots", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+                sLog.outErrorDb("TCSR: Creature template entry %u does not exist in DB, which is required by npc_air_force_bots", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
                 return;
             }
         }
@@ -150,7 +150,7 @@ struct npc_air_force_botsAI : public ScriptedAI
             m_uiSpawnedGUID = pSummoned->GetGUID();
         else
         {
-            error_db_log("TCSR: npc_air_force_bots: wasn't able to spawn Creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+            sLog.outErrorDb("TCSR: npc_air_force_bots: wasn't able to spawn Creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
             m_pSpawnAssoc = NULL;
         }
 
@@ -787,7 +787,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff)
                 case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand()%3]; break;
                 case DOCTOR_HORDE:    patientEntry = HordeSoldierId[rand()%3]; break;
                 default:
-                    error_log("TSCR: Invalid entry for Triage doctor. Please check your database");
+                    sLog.outError("TSCR: Invalid entry for Triage doctor. Please check your database");
                     return;
             }
 
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index e701e073d5c..0f27400dce2 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -450,7 +450,7 @@ void Log::outCrash(const char * err, ...)
     va_list ap;
 
     va_start(ap, err);
-    vutf8printf(stdout, err, &ap);
+    vutf8printf(stderr, err, &ap);
     va_end(ap);
 
     if (m_colored)
@@ -530,7 +530,6 @@ void Log::outArena(const char * str, ...)
         va_end(ap);
         fflush(arenaLogFile);
     }
-    fflush(stdout);
 }
 
 void Log::outErrorDb(const char * err, ...)
@@ -902,7 +901,6 @@ void Log::outRemote(const char * str, ...)
         va_end(ap);
         fflush(raLogfile);
     }
-    fflush(stdout);
 }
 
 void Log::outChat(const char * str, ...)
@@ -930,76 +928,4 @@ void Log::outChat(const char * str, ...)
         fflush(chatLogfile);
         va_end(ap);
     }
-    fflush(stdout);
-}
-
-void outstring_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outString(buf);
 }
-
-void detail_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outDetail(buf);
-}
-
-void debug_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outDebug(buf);
-}
-
-void error_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outError(buf);
-}
-
-void error_db_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outErrorDb(buf);
-}
-
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index deb6c55e4e0..53ce4e601b5 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -180,11 +180,5 @@ class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_
 #define DEBUG_LOG
 #endif
 
-// primary for script library
-void  outstring_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  detail_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  debug_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  error_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
 #endif
 
-- 
cgit v1.2.3


From ffaffe3fd753b0afc75679c9730276871a9d034a Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Wed, 23 Jun 2010 01:47:41 +0200
Subject: * Renamed several VS projects and the executables they produce to
 reflect the new naming convention. * Cleaned up some useless and redundant
 preprocessor definitions. * Fixed the win build so that it correctly uses the
 mysql lib it built from the sources. * Note that you still need to use
 8615_mysql_openssl_libs.zip for the OpenSSL binaries. * Also note that Win
 x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
---
 externals/ace/win/VC90/ace.vcproj                  |  17 +-
 externals/bzip2/win/VC90/bzip2.vcproj              |  22 +-
 externals/g3dlite/win/VC90/g3dlite.vcproj          |  28 +-
 externals/libmpq/win/VC90/libmpq.vcproj            |  20 +-
 externals/mysql/win/VC90/libmysql.vcproj           | 937 +++++++++++----------
 externals/sockets/win/VC90/sockets.vcproj          |  20 +-
 externals/zlib/win/VC90/zlib.vcproj                |  18 +-
 src/server/authserver/Main.cpp                     |  10 +-
 src/server/game/PrecompiledHeaders/ScriptPCH.h     |   2 +-
 src/server/game/Scripting/ScriptLoader.cpp         |   2 +-
 src/server/game/Spells/Spell.h                     |   4 +-
 src/server/shared/CompilerDefs.h                   |   2 +-
 src/server/shared/Database/Database.cpp            |   2 +-
 src/server/shared/Database/Database.h              |   2 +-
 src/server/shared/Database/QueryResult.h           |   2 +-
 src/server/shared/Utilities/ServiceWin32.cpp       |   2 +-
 src/server/shared/Utilities/ServiceWin32.h         |   4 +-
 src/server/shared/Utilities/Util.cpp               |   2 +-
 src/server/worldserver/Main.cpp                    |   6 +-
 src/server/worldserver/Master.cpp                  |   8 +-
 .../worldserver/WorldThread/WorldRunnable.cpp      |   4 +-
 src/tools/ExtractorToolsVC90.sln                   |  54 +-
 src/tools/map_extractor/System.cpp                 |   4 +-
 src/tools/map_extractor/VC90/VC90_ad.vcproj        | 265 ------
 .../map_extractor/VC90/VC90_mapextractor.vcproj    | 264 ++++++
 src/tools/map_extractor/loadlib/loadlib.h          |   2 +-
 .../VC90/VC90_vmap3assembler.vcproj                | 247 ++++++
 .../vmap3_assembler/VC90/vmap_assembler.vcproj     | 244 ------
 .../VC90/VC90_vmap3extractor.vcproj                | 276 ++++++
 .../vmap3_extractor/VC90/vmap3_extractor.vcproj    | 271 ------
 src/tools/vmap3_extractor/adtfile.cpp              |   2 +-
 src/tools/vmap3_extractor/loadlib/loadlib.h        |   2 +-
 src/tools/vmap3_extractor/mpq_libmpq04.h           |   3 -
 src/tools/vmap3_extractor/vmapexport.cpp           |   2 +-
 win/TrinityCore&Script VC90.sln                    |  69 +-
 win/VC90/TrinityCore.vcproj                        | 504 -----------
 win/VC90/TrinityRealm.vcproj                       | 475 -----------
 win/VC90/authserver.vcproj                         | 477 +++++++++++
 win/VC90/game.vcproj                               |  32 +-
 win/VC90/genrevision.vcproj                        |  13 +-
 win/VC90/shared.vcproj                             |  42 +-
 win/VC90/worldserver.vcproj                        | 506 +++++++++++
 42 files changed, 2457 insertions(+), 2411 deletions(-)
 delete mode 100644 src/tools/map_extractor/VC90/VC90_ad.vcproj
 create mode 100644 src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
 create mode 100644 src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
 delete mode 100644 src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
 create mode 100644 src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
 delete mode 100644 src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
 delete mode 100644 win/VC90/TrinityCore.vcproj
 delete mode 100644 win/VC90/TrinityRealm.vcproj
 create mode 100644 win/VC90/authserver.vcproj
 create mode 100644 win/VC90/worldserver.vcproj

(limited to 'src/server/shared')

diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj
index f54385fbd7a..39b0872d0a4 100644
--- a/externals/ace/win/VC90/ace.vcproj
+++ b/externals/ace/win/VC90/ace.vcproj
@@ -52,7 +52,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -143,7 +143,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -235,13 +235,14 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinAcePCH.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				DisableSpecificWarnings="4355"
 				ForcedIncludeFiles="WinAcePCH.h"
 			/>
@@ -325,7 +326,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
@@ -481,7 +482,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -489,7 +490,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1285,7 +1286,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1293,7 +1294,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
diff --git a/externals/bzip2/win/VC90/bzip2.vcproj b/externals/bzip2/win/VC90/bzip2.vcproj
index de4ca649e37..98b3a33d9b1 100644
--- a/externals/bzip2/win/VC90/bzip2.vcproj
+++ b/externals/bzip2/win/VC90/bzip2.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -84,8 +84,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -148,8 +148,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -175,14 +175,14 @@
 				EnableIntrinsicFunctions="false"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/externals/g3dlite/win/VC90/g3dlite.vcproj b/externals/g3dlite/win/VC90/g3dlite.vcproj
index f70fd21cad8..6d6c4c07fc5 100644
--- a/externals/g3dlite/win/VC90/g3dlite.vcproj
+++ b/externals/g3dlite/win/VC90/g3dlite.vcproj
@@ -47,16 +47,17 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation=""
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -122,16 +123,17 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation=""
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -195,18 +197,18 @@
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN32"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CallingConvention="0"
 			/>
 			<Tool
@@ -268,15 +270,15 @@
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
diff --git a/externals/libmpq/win/VC90/libmpq.vcproj b/externals/libmpq/win/VC90/libmpq.vcproj
index 13ce6289775..83947857137 100644
--- a/externals/libmpq/win/VC90/libmpq.vcproj
+++ b/externals/libmpq/win/VC90/libmpq.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -49,6 +49,7 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4103;4244;4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -61,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
@@ -82,8 +83,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -109,14 +110,15 @@
 				EnableIntrinsicFunctions="false"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_NDEBUG"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				WarningLevel="3"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4103;4244;4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,7 +131,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
diff --git a/externals/mysql/win/VC90/libmysql.vcproj b/externals/mysql/win/VC90/libmysql.vcproj
index a6c2f1e2947..05129673111 100644
--- a/externals/mysql/win/VC90/libmysql.vcproj
+++ b/externals/mysql/win/VC90/libmysql.vcproj
@@ -54,22 +54,21 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" /Zm1000 /MP /wd4005"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="..\..\;..\..\include;..\..\libmysql;..\..\regex;..\..\sql;..\..\strings;..\..\..\zlib;..\..\dbug;..\..\extlib\yassl\taocrypt\mySTL;..\..\extlib\yassl\taocrypt\include;..\..\extlib\yassl\include"
-				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="_WINDOWS;ENABLED_DEBUG_SYNC;__WIN__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;YASSL_PREFIX;HAVE_YASSL;YASSL_PURE_C;HAVE_OPENSSL"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Debug"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="2"
-				DisableSpecificWarnings="4800;4805;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -86,14 +85,16 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  "
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\libmysql.dll"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib $(NOINHERIT)"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll"
 				Version="16.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="&quot;..\..\libmysql\libmysql.def&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(ProjectName)__$(PlatformName)_$(ConfigurationName)\libmysql.pdb"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
 				ImportLibrary=""
 			/>
 			<Tool
@@ -119,7 +120,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
@@ -141,9 +142,9 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
 				MkTypLibCompatible="false"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				GenerateStublessProxies="true"
 				TypeLibraryName="$(InputName).tlb"
 				OutputDirectory="$(IntDir)"
@@ -154,28 +155,29 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" /Zm1000 /MP /wd4005"
-				Optimization="2"
+				AdditionalOptions="/MP"
+				Optimization="0"
 				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="..\..\;..\..\include;..\..\libmysql;..\..\regex;..\..\sql;..\..\strings;..\..\..\zlib;..\..\dbug;..\..\extlib\yassl\taocrypt\mySTL;..\..\extlib\yassl\taocrypt\include;..\..\extlib\yassl\include"
-				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="_WINDOWS;ENABLED_DEBUG_SYNC;__WIN__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;YASSL_PREFIX;HAVE_YASSL;YASSL_PURE_C;HAVE_OPENSSL"
 				ExceptionHandling="0"
-				RuntimeLibrary="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Release"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="2"
-				DisableSpecificWarnings="4800;4805;4996"
+				DisableSpecificWarnings="4244;4267"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
 				AdditionalIncludeDirectories="&quot;..\..\include&quot;;&quot;..\..\libmysql&quot;;&quot;..\..\regex&quot;;&quot;..\..\sql&quot;;&quot;..\..\strings&quot;;&quot;..\..\extlib\zlib&quot;;&quot;..\..\dbug&quot;;&quot;..\..\extlib\yassl\taocrypt\mySTL&quot;;&quot;..\..\extlib\yassl\taocrypt\include&quot;;&quot;..\..\extlib\yassl\include&quot;;"
 			/>
 			<Tool
@@ -184,16 +186,19 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalOptions=" /STACK:10000000 /machine:X86"
+				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  "
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\libmysql.dll"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll"
 				Version="16.0"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="&quot;..\..\libmysql\libmysql.def&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(ProjectName)__$(PlatformName)_$(ConfigurationName)\libmysql.pdb"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
 				ImportLibrary=""
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -218,9 +223,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -240,9 +245,9 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
 				MkTypLibCompatible="false"
-				TargetEnvironment="3"
+				TargetEnvironment="1"
 				GenerateStublessProxies="true"
 				TypeLibraryName="$(InputName).tlb"
 				OutputDirectory="$(IntDir)"
@@ -253,29 +258,28 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" /Zm1000 /MP /wd4005"
-				Optimization="0"
+				AdditionalOptions="/MP"
+				Optimization="2"
 				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="..\..\;..\..\include;..\..\libmysql;..\..\regex;..\..\sql;..\..\strings;..\..\..\zlib;..\..\dbug;..\..\extlib\yassl\taocrypt\mySTL;..\..\extlib\yassl\taocrypt\include;..\..\extlib\yassl\include"
-				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="_WINDOWS;NDEBUG;DBUG_OFF;__WIN__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;YASSL_PREFIX;HAVE_YASSL;YASSL_PURE_C;HAVE_OPENSSL"
 				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="0"
+				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Debug"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="2"
-				DisableSpecificWarnings="4800;4805;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,ENABLED_DEBUG_SYNC,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Debug\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
 				AdditionalIncludeDirectories="&quot;..\..\include&quot;;&quot;..\..\libmysql&quot;;&quot;..\..\regex&quot;;&quot;..\..\sql&quot;;&quot;..\..\strings&quot;;&quot;..\..\extlib\zlib&quot;;&quot;..\..\dbug&quot;;&quot;..\..\extlib\yassl\taocrypt\mySTL&quot;;&quot;..\..\extlib\yassl\taocrypt\include&quot;;&quot;..\..\extlib\yassl\include&quot;;"
 			/>
 			<Tool
@@ -284,17 +288,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  "
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\libmysql.dll"
+				AdditionalOptions=" /STACK:10000000 /machine:X86"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib $(NOINHERIT)"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll"
 				Version="16.0"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="&quot;..\..\libmysql\libmysql.def&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(ProjectName)__$(PlatformName)_$(ConfigurationName)\libmysql.pdb"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
 				ImportLibrary=""
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -320,8 +325,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -354,21 +359,23 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" /Zm1000 /MP /wd4005"
+				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="..\..\;..\..\include;..\..\libmysql;..\..\regex;..\..\sql;..\..\strings;..\..\..\zlib;..\..\dbug;..\..\extlib\yassl\taocrypt\mySTL;..\..\extlib\yassl\taocrypt\include;..\..\extlib\yassl\include"
-				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,HAVE_COMPRESS,_LIB,YASSL_PREFIX,HAVE_YASSL,YASSL_PURE_C,HAVE_OPENSSL,PTHREAD_STACK_MIN=1048576,HAVE_CONFIG_H,HAVE_CONFIG_H,CMAKE_INTDIR=\&quot;Release\&quot;,libmysql_EXPORTS"
+				PreprocessorDefinitions="_WINDOWS;NDEBUG;DBUG_OFF;__WIN__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;YASSL_PREFIX;HAVE_YASSL;YASSL_PURE_C;HAVE_OPENSSL"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Release"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="2"
-				DisableSpecificWarnings="4800;4805;4996"
+				DisableSpecificWarnings="4244;4267"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -386,13 +393,15 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  "
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\libmysql.dll"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll"
 				Version="16.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="&quot;..\..\libmysql\libmysql.def&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(ProjectName)__$(PlatformName)_$(ConfigurationName)\libmysql.pdb"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
 				ImportLibrary=""
 				TargetMachine="17"
 			/>
@@ -437,7 +446,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -445,7 +454,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -489,7 +498,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -497,7 +506,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -545,7 +554,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -553,7 +562,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -597,7 +606,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -605,7 +614,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -649,7 +658,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -657,7 +666,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -701,7 +710,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -709,7 +718,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -753,7 +762,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -761,7 +770,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -805,7 +814,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -813,7 +822,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -865,7 +874,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -873,7 +882,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -917,7 +926,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -925,7 +934,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -969,7 +978,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -977,7 +986,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1021,7 +1030,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1029,7 +1038,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1077,7 +1086,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1085,7 +1094,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1113,7 +1122,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1121,7 +1130,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1153,7 +1162,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1161,7 +1170,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1205,7 +1214,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1213,7 +1222,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1257,7 +1266,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1265,7 +1274,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1309,7 +1318,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1317,7 +1326,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1361,7 +1370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1369,7 +1378,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1413,7 +1422,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1421,7 +1430,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1465,7 +1474,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1473,7 +1482,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1517,7 +1526,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1525,7 +1534,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1569,7 +1578,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1577,7 +1586,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1621,7 +1630,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1629,7 +1638,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1673,7 +1682,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1681,7 +1690,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1725,7 +1734,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1733,7 +1742,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1777,7 +1786,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1785,7 +1794,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1829,7 +1838,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1837,7 +1846,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1881,7 +1890,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1889,7 +1898,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1933,7 +1942,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1941,7 +1950,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1985,7 +1994,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1993,7 +2002,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2037,7 +2046,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2045,7 +2054,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2089,7 +2098,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2097,7 +2106,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2141,7 +2150,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2149,7 +2158,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2193,7 +2202,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2201,7 +2210,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2245,7 +2254,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2253,7 +2262,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2297,7 +2306,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2305,7 +2314,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2349,7 +2358,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2357,7 +2366,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2401,7 +2410,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2409,7 +2418,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2449,7 +2458,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2457,7 +2466,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2501,7 +2510,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2509,7 +2518,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2553,7 +2562,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2561,7 +2570,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2605,7 +2614,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2613,7 +2622,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2661,7 +2670,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2669,7 +2678,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2718,7 +2727,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2727,7 +2736,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2775,7 +2784,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2783,7 +2792,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2827,7 +2836,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2835,7 +2844,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2863,7 +2872,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2871,7 +2880,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2899,7 +2908,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2907,7 +2916,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2935,7 +2944,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2943,7 +2952,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2971,7 +2980,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2979,7 +2988,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3027,7 +3036,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3035,7 +3044,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3079,7 +3088,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3087,7 +3096,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3131,7 +3140,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3139,7 +3148,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3183,7 +3192,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3191,7 +3200,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3235,7 +3244,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3243,7 +3252,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3291,7 +3300,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3299,7 +3308,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3343,7 +3352,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3351,7 +3360,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3403,7 +3412,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3411,7 +3420,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3464,7 +3473,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3473,7 +3482,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3521,7 +3530,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3529,7 +3538,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3573,7 +3582,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3581,7 +3590,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3625,7 +3634,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3633,7 +3642,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3677,7 +3686,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3685,7 +3694,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3729,7 +3738,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3737,7 +3746,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3781,7 +3790,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3789,7 +3798,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3833,7 +3842,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3841,7 +3850,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3885,7 +3894,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3893,7 +3902,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3937,7 +3946,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3945,7 +3954,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3989,7 +3998,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3997,7 +4006,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4041,7 +4050,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4049,7 +4058,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4093,7 +4102,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4101,7 +4110,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4145,7 +4154,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4153,7 +4162,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4197,7 +4206,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4205,7 +4214,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4249,7 +4258,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4257,7 +4266,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4301,7 +4310,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4309,7 +4318,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4353,7 +4362,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4361,7 +4370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4405,7 +4414,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4413,7 +4422,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4457,7 +4466,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4465,7 +4474,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4509,7 +4518,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4517,7 +4526,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4561,7 +4570,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4569,7 +4578,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4613,7 +4622,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4621,7 +4630,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4665,7 +4674,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4673,7 +4682,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4717,7 +4726,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4725,7 +4734,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4769,7 +4778,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4777,7 +4786,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4821,7 +4830,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4829,7 +4838,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4873,7 +4882,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4881,7 +4890,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4929,7 +4938,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4937,7 +4946,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4981,7 +4990,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -4989,7 +4998,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5033,7 +5042,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5041,7 +5050,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5085,7 +5094,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5093,7 +5102,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5137,7 +5146,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5145,7 +5154,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5189,7 +5198,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5197,7 +5206,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5241,7 +5250,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5249,7 +5258,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5293,7 +5302,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5301,7 +5310,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5345,7 +5354,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5353,7 +5362,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5397,7 +5406,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5405,7 +5414,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5449,7 +5458,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5457,7 +5466,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5501,7 +5510,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5509,7 +5518,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5553,7 +5562,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5561,7 +5570,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5605,7 +5614,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5613,7 +5622,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5657,7 +5666,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5665,7 +5674,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5709,7 +5718,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5717,7 +5726,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5761,7 +5770,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5769,7 +5778,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5813,7 +5822,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5821,7 +5830,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5865,7 +5874,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5873,7 +5882,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5917,7 +5926,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5925,7 +5934,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5969,7 +5978,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -5977,7 +5986,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6021,7 +6030,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6029,7 +6038,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6073,7 +6082,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6081,7 +6090,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6125,7 +6134,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6133,7 +6142,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6177,7 +6186,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6185,7 +6194,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6229,7 +6238,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6237,7 +6246,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6281,7 +6290,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6289,7 +6298,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6333,7 +6342,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6341,7 +6350,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6385,7 +6394,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6393,7 +6402,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6437,7 +6446,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6445,7 +6454,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6489,7 +6498,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6497,7 +6506,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6541,7 +6550,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6549,7 +6558,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6593,7 +6602,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6601,7 +6610,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6645,7 +6654,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6653,7 +6662,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6697,7 +6706,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6705,7 +6714,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6749,7 +6758,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6757,7 +6766,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6801,7 +6810,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6809,7 +6818,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6853,7 +6862,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6861,7 +6870,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6905,7 +6914,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6913,7 +6922,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6957,7 +6966,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6965,7 +6974,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7009,7 +7018,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7017,7 +7026,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7061,7 +7070,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7069,7 +7078,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7113,7 +7122,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7121,7 +7130,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7165,7 +7174,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7173,7 +7182,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7217,7 +7226,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7225,7 +7234,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7269,7 +7278,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7277,7 +7286,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7321,7 +7330,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7329,7 +7338,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7373,7 +7382,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7381,7 +7390,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7425,7 +7434,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7433,7 +7442,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7477,7 +7486,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7485,7 +7494,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7529,7 +7538,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7537,7 +7546,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7581,7 +7590,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7589,7 +7598,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7633,7 +7642,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7641,7 +7650,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7685,7 +7694,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7693,7 +7702,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7737,7 +7746,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7745,7 +7754,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7789,7 +7798,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7797,7 +7806,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7841,7 +7850,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7849,7 +7858,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7893,7 +7902,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7901,7 +7910,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7945,7 +7954,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7953,7 +7962,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -7997,7 +8006,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8005,7 +8014,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8049,7 +8058,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8057,7 +8066,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8101,7 +8110,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8109,7 +8118,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8153,7 +8162,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8161,7 +8170,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8205,7 +8214,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8213,7 +8222,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8257,7 +8266,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8265,7 +8274,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8309,7 +8318,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8317,7 +8326,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8361,7 +8370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8369,7 +8378,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8413,7 +8422,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8421,7 +8430,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8465,7 +8474,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8473,7 +8482,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8517,7 +8526,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8525,7 +8534,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8569,7 +8578,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8577,7 +8586,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8621,7 +8630,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8629,7 +8638,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8673,7 +8682,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8681,7 +8690,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8725,7 +8734,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8733,7 +8742,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8777,7 +8786,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8785,7 +8794,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8829,7 +8838,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8837,7 +8846,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8881,7 +8890,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8889,7 +8898,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8937,7 +8946,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8945,7 +8954,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -8997,7 +9006,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9005,7 +9014,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9049,7 +9058,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9057,7 +9066,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9105,7 +9114,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9113,7 +9122,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9165,7 +9174,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9173,7 +9182,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9217,7 +9226,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9225,7 +9234,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9269,7 +9278,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9277,7 +9286,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9321,7 +9330,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9329,7 +9338,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9373,7 +9382,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9381,7 +9390,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9425,7 +9434,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9433,7 +9442,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9477,7 +9486,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9485,7 +9494,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9529,7 +9538,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9537,7 +9546,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9581,7 +9590,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9589,7 +9598,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9633,7 +9642,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9641,7 +9650,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9685,7 +9694,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9693,7 +9702,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9737,7 +9746,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9745,7 +9754,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9789,7 +9798,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9797,7 +9806,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9841,7 +9850,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9849,7 +9858,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9893,7 +9902,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9901,7 +9910,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9945,7 +9954,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9953,7 +9962,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -9997,7 +10006,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10005,7 +10014,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10049,7 +10058,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10057,7 +10066,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10101,7 +10110,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10109,7 +10118,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10153,7 +10162,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10161,7 +10170,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10205,7 +10214,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10213,7 +10222,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10257,7 +10266,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10265,7 +10274,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10309,7 +10318,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10317,7 +10326,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10361,7 +10370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10369,7 +10378,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10417,7 +10426,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10425,7 +10434,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10469,7 +10478,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10477,7 +10486,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10505,7 +10514,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10513,7 +10522,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10557,7 +10566,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10565,7 +10574,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10593,7 +10602,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10601,7 +10610,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10645,7 +10654,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10653,7 +10662,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10697,7 +10706,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10705,7 +10714,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10749,7 +10758,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10757,7 +10766,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10801,7 +10810,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10809,7 +10818,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10853,7 +10862,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10861,7 +10870,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10905,7 +10914,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10913,7 +10922,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10969,7 +10978,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -10977,7 +10986,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
diff --git a/externals/sockets/win/VC90/sockets.vcproj b/externals/sockets/win/VC90/sockets.vcproj
index efa94ef78af..3660ebeee93 100644
--- a/externals/sockets/win/VC90/sockets.vcproj
+++ b/externals/sockets/win/VC90/sockets.vcproj
@@ -45,14 +45,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -115,14 +116,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -184,12 +186,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="..\..\include;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -252,14 +256,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="..\..\include;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
diff --git a/externals/zlib/win/VC90/zlib.vcproj b/externals/zlib/win/VC90/zlib.vcproj
index 2b35253a7d0..8ffe8163edc 100644
--- a/externals/zlib/win/VC90/zlib.vcproj
+++ b/externals/zlib/win/VC90/zlib.vcproj
@@ -45,14 +45,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -114,14 +115,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -182,7 +184,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -192,7 +194,7 @@
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CallingConvention="0"
 			/>
 			<Tool
@@ -252,14 +254,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 7dbb1c95b5b..46ea2b38212 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -45,7 +45,7 @@
 # define _TRINITY_REALM_CONFIG  "authserver.conf"
 #endif //_TRINITY_REALM_CONFIG
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 char serviceName[] = "TrinityRealm";
 char serviceLongName[] = "Trinity realm service";
@@ -92,7 +92,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"
@@ -122,7 +122,7 @@ extern int main(int argc, char **argv)
                 cfg_file = argv[c];
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         ////////////
         //Services//
         ////////////
@@ -243,7 +243,7 @@ extern int main(int argc, char **argv)
     #endif /* _WIN32 */();
 
     ///- Handle affinity for multiple processors and process priority on Windows
-    #ifdef WIN32
+    #ifdef _WIN32
     {
         HANDLE hProcess = GetCurrentProcess();
 
@@ -315,7 +315,7 @@ extern int main(int argc, char **argv)
             sLog.outDetail("Ping MySQL to keep connection alive");
             LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
         }
-#ifdef WIN32
+#ifdef _WIN32
         if (m_ServiceStatus == 0) stopEvent = true;
         while (m_ServiceStatus == 2) Sleep(1000);
 #endif
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h
index 1e83a88b87a..f8515e99f89 100644
--- a/src/server/game/PrecompiledHeaders/ScriptPCH.h
+++ b/src/server/game/PrecompiledHeaders/ScriptPCH.h
@@ -23,7 +23,7 @@
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 
 #endif
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 37af3c50691..7bdf7eb6e4e 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -16,7 +16,7 @@
 
 #include "ScriptPCH.h"
 
-#ifdef WIN32
+#ifdef _WIN32
   #define DO_SCRIPTS
 #endif
 
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index a987e35e65d..372c668d2de 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -769,14 +769,14 @@ namespace Trinity
             }
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         template<> inline void Visit(CorpseMapType &) {}
         template<> inline void Visit(GameObjectMapType &) {}
         template<> inline void Visit(DynamicObjectMapType &) {}
         #endif
     };
 
-    #ifndef WIN32
+    #ifndef _WIN32
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(CorpseMapType&) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(GameObjectMapType&) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(DynamicObjectMapType&) {}
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h
index fb7dbfe4caa..d2d470e2097 100644
--- a/src/server/shared/CompilerDefs.h
+++ b/src/server/shared/CompilerDefs.h
@@ -26,7 +26,7 @@
 #define PLATFORM_APPLE   2
 #define PLATFORM_INTEL   3
 
-// must be first (win 64 also define WIN32)
+// must be first (win 64 also define _WIN32)
 #if defined( _WIN64 )
 #  define PLATFORM PLATFORM_WINDOWS
 #elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 91275716bf8..2dd2f9bbda4 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -113,7 +113,7 @@ bool Database::Initialize(const char *infoString)
         database = *iter++;
 
     mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
-    #ifdef WIN32
+    #ifdef _WIN32
     if (host==".")                                           // named pipe use option (Windows)
     {
         unsigned int opt = MYSQL_PROTOCOL_PIPE;
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 96588adbf10..655479c85fe 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -28,7 +28,7 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <mysql/mysql.h>
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 4eec9915362..5562a9abfa4 100644
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -26,7 +26,7 @@
 
 #include "Field.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <mysql/mysql.h>
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index 513dd64b505..a50a4f9d039 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "Common.h"
 #include "Log.h"
diff --git a/src/server/shared/Utilities/ServiceWin32.h b/src/server/shared/Utilities/ServiceWin32.h
index ddac785a0fb..4dbd329a5fa 100644
--- a/src/server/shared/Utilities/ServiceWin32.h
+++ b/src/server/shared/Utilities/ServiceWin32.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef _WIN32_SERVICE_
 #define _WIN32_SERVICE_
 
@@ -27,5 +27,5 @@ bool WinServiceUninstall();
 bool WinServiceRun();
 
 #endif                                                      // _WIN32_SERVICE_
-#endif                                                      // WIN32
+#endif                                                      // _WIN32
 
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 14c0431c967..97dfde6c92b 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -195,7 +195,7 @@ uint32 CreatePIDFile(const std::string& filename)
     if (pid_file == NULL)
         return 0;
 
-#ifdef WIN32
+#ifdef _WIN32
     DWORD pid = GetCurrentProcessId();
 #else
     pid_t pid = getpid();
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 25c0b4be762..5166ca741df 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -37,7 +37,7 @@
 # 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 98a28093199..332a607dcad 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -50,7 +50,7 @@
 #include "ListenSocket.h"
 #include "BigNumber.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 extern int m_ServiceStatus;
 #endif
@@ -285,7 +285,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 +298,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 +386,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);
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index c674ddbc06f..3531873ec0c 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
diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln
index 5887925dcf1..7881797979a 100644
--- a/src/tools/ExtractorToolsVC90.sln
+++ b/src/tools/ExtractorToolsVC90.sln
@@ -1,21 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1}
@@ -33,24 +18,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapextractor", "map_extractor\VC90\VC90_mapextractor.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3assembler", "vmap3_assembler\VC90\VC90_vmap3assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3extractor", "vmap3_extractor\VC90\VC90_vmap3extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
@@ -67,6 +55,18 @@ Global
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 6abe2364cd6..3a328e91bf4 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -5,7 +5,7 @@
 #include <set>
 #include <cstdlib>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "direct.h"
 #else
 #include <sys/stat.h>
@@ -88,7 +88,7 @@ static char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "z
 
 void CreateDir( const std::string& Path )
 {
-    #ifdef WIN32
+    #ifdef _WIN32
     _mkdir( Path.c_str());
     #else
     mkdir( Path.c_str(), 0777 );
diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj
deleted file mode 100644
index e875137556c..00000000000
--- a/src/tools/map_extractor/VC90/VC90_ad.vcproj
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ad"
-	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	RootNamespace="ad"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\ad.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				XMLDocumentationFileName="$(IntDir)\"
-				BrowseInformation="0"
-				BrowseInformationFile=""
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="$(OutDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-				XMLDocumentationFileName="$(IntDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile=""
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\loadlib\adt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\dbcfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loadlib\loadlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\mpq_libmpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\System.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loadlib\wdt.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\dbcfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mpq_libmpq.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
new file mode 100644
index 00000000000..c943d93d84e
--- /dev/null
+++ b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="mapextractor"
+	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
+	RootNamespace="ad"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="./ad.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\ad.pch"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				XMLDocumentationFileName="$(IntDir)\"
+				BrowseInformation="0"
+				BrowseInformationFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1049"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="./ad.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				XMLDocumentationFileName="$(IntDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1049"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\loadlib\adt.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\dbcfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\loadlib\loadlib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\mpq_libmpq.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\System.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\loadlib\wdt.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\dbcfile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\mpq_libmpq.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 6acfd107ec7..48fe794f8dc 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#ifdef _WIN32
 typedef __int64            int64;
 typedef long               int32;
 typedef short              int16;
diff --git a/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
new file mode 100644
index 00000000000..1f3376e71b7
--- /dev/null
+++ b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="vmap3assembler"
+	ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	RootNamespace="vmap_assembler"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				UsePrecompiledHeader="0"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\VMapAssembler.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="vmaplib"
+			>
+			<File
+				RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.h"
+				>
+			</File>
+			<Filter
+				Name="Maps"
+				>
+				<File
+					RelativePath="..\..\..\server\collision\Maps\TileAssembler.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\server\collision\Maps\TileAssembler.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Models"
+				>
+				<File
+					RelativePath="..\..\..\server\collision\Models\ModelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\server\collision\Models\ModelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\server\collision\Models\WorldModel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\server\collision\Models\WorldModel.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
deleted file mode 100644
index 63a99dfa421..00000000000
--- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="vmap_assembler"
-	ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	RootNamespace="vmap_assembler"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\VMapAssembler.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="vmaplib"
-			>
-			<File
-				RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.h"
-				>
-			</File>
-			<Filter
-				Name="Maps"
-				>
-				<File
-					RelativePath="..\..\..\server\collision\Maps\TileAssembler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\server\collision\Maps\TileAssembler.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Models"
-				>
-				<File
-					RelativePath="..\..\..\server\collision\Models\ModelInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\server\collision\Models\ModelInstance.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\server\collision\Models\WorldModel.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\server\collision\Models\WorldModel.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj b/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
new file mode 100644
index 00000000000..3dd343f3845
--- /dev/null
+++ b/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="vmap3extractor"
+	ProjectGUID="{502602CC-98EA-4335-B922-C5C1DBF37604}"
+	RootNamespace="vmap3_extractor"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="false"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\adtfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\dbcfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\model.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\mpq_libmpq.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\vmapexport.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\wdtfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\wmo.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\adtfile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\dbcfile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\model.h"
+				>
+			</File>
+			<File
+				RelativePath="..\modelheaders.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mpq_libmpq04.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vec3d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vmapexport.h"
+				>
+			</File>
+			<File
+				RelativePath="..\wdtfile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\wmo.h"
+				>
+			</File>
+			<Filter
+				Name="loadlib"
+				>
+				<File
+					RelativePath="..\loadlib\loadlib.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
deleted file mode 100644
index 34665937c9a..00000000000
--- a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="vmap3_extractor"
-	ProjectGUID="{502602CC-98EA-4335-B922-C5C1DBF37604}"
-	RootNamespace="vmap3_extractor"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="false"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\adtfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\dbcfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\model.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\mpq_libmpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\vmapexport.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\wdtfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\wmo.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\adtfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\dbcfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\model.h"
-				>
-			</File>
-			<File
-				RelativePath="..\modelheaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\mpq_libmpq04.h"
-				>
-			</File>
-			<File
-				RelativePath="..\vec3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\vmapexport.h"
-				>
-			</File>
-			<File
-				RelativePath="..\wdtfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\wmo.h"
-				>
-			</File>
-			<Filter
-				Name="loadlib"
-				>
-				<File
-					RelativePath="..\loadlib\loadlib.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/tools/vmap3_extractor/adtfile.cpp b/src/tools/vmap3_extractor/adtfile.cpp
index 314255d3a58..58c1bb94b1c 100644
--- a/src/tools/vmap3_extractor/adtfile.cpp
+++ b/src/tools/vmap3_extractor/adtfile.cpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <cstdio>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define snprintf _snprintf
 #endif
 
diff --git a/src/tools/vmap3_extractor/loadlib/loadlib.h b/src/tools/vmap3_extractor/loadlib/loadlib.h
index 53731753425..49d5f590744 100644
--- a/src/tools/vmap3_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap3_extractor/loadlib/loadlib.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#ifdef _WIN32
 typedef __int64            int64;
 typedef __int32            int32;
 typedef __int16            int16;
diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index ccbfe37cba7..4fe80f2759c 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
@@ -1,6 +1,3 @@
-#define _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_WARNINGS
-
 #ifndef MPQ_H
 #define MPQ_H
 
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 913fd4f9e4a..82e9bd7cc7b 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -5,7 +5,7 @@
 #include <list>
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
     #include <Windows.h>
     #include <sys/stat.h>
     #include <direct.h>
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln
index 617480e588d..1d611835132 100644
--- a/win/TrinityCore&Script VC90.sln	
+++ b/win/TrinityCore&Script VC90.sln	
@@ -15,16 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcpro
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC90\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC90\TrinityRealm.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "..\externals\ace\win\VC90\ace.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
@@ -36,6 +26,21 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\externals\sockets\win\VC90\sockets.vcproj", "{9DF7A84E-C644-4720-A79D-C98CB950E34C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "..\externals\mysql\win\VC90\libmysql.vcproj", "{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{FAC6B1DA-4242-4891-81CB-F366A8FC655F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "authserver", "VC90\authserver.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "worldserver", "VC90\worldserver.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -61,22 +66,6 @@ Global
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,14 +108,38 @@ Global
 		{9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.Build.0 = Release|x64
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.Build.0 = Debug|Win32
-		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.ActiveCfg = Debug|Win32
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.ActiveCfg = Debug|x64
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.Build.0 = Debug|x64
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.ActiveCfg = Release|Win32
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.Build.0 = Release|Win32
-		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.ActiveCfg = Release|Win32
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.ActiveCfg = Release|x64
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.Build.0 = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj
deleted file mode 100644
index ef2b76ae774..00000000000
--- a/win/VC90/TrinityCore.vcproj
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="TrinityCore"
-	ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	RootNamespace="trinitycore"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch"
-				AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\TrinityCore.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch"
-				AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map"
-				SubSystem="1"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\TrinityCore.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch"
-				AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
-				Version=""
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\TrinityCore.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch"
-				AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
-				Version=""
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\TrinityCore.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="doc"
-			>
-			<File
-				RelativePath="..\..\COPYING"
-				>
-			</File>
-			<File
-				RelativePath="..\..\README"
-				>
-			</File>
-			<File
-				RelativePath="..\..\README.AHBOT"
-				>
-			</File>
-			<File
-				RelativePath="..\..\THANKS"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\server\worldserver\CommandLine\CliRunnable.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\CommandLine\CliRunnable.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\Main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\Master.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\Master.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\RemoteAccess\RASocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\RemoteAccess\RASocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\WorldThread\WorldRunnable.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\WorldThread\WorldRunnable.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\worldserver\worldserver.rc"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
deleted file mode 100644
index 68927fbc4ab..00000000000
--- a/win/VC90/TrinityRealm.vcproj
+++ /dev/null
@@ -1,475 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="TrinityRealm"
-	ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}"
-	RootNamespace="TrinityRealm"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch"
-				AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch"
-				AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch"
-				AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch"
-				AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
-				GenerateMapFile="true"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\authserver.rc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Server\AuthSocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Server\AuthSocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Server\RealmAcceptor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Realms\RealmList.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Realms\RealmList.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Server\RealmSocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\authserver\Server\RealmSocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/authserver.vcproj b/win/VC90/authserver.vcproj
new file mode 100644
index 00000000000..af3b474ff69
--- /dev/null
+++ b/win/VC90/authserver.vcproj
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="authserver"
+	ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}"
+	RootNamespace="TrinityRealm"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				LargeAddressAware="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
+				IgnoreStandardIncludePath="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				LargeAddressAware="2"
+				RandomizedBaseAddress="1"
+				FixedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
+				IgnoreStandardIncludePath="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				FixedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\authserver.rc"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Server\AuthSocket.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Server\AuthSocket.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Main.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Server\RealmAcceptor.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Realms\RealmList.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Realms\RealmList.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Server\RealmSocket.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\authserver\Server\RealmSocket.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 862ad8a579b..aed9f2ff179 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -49,19 +49,20 @@
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -135,19 +136,20 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -218,7 +220,7 @@
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -228,8 +230,8 @@
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
 				AssemblerListingLocation=""
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -301,7 +303,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -310,9 +312,9 @@
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj
index 13eda318a32..662a3e9a9e2 100644
--- a/win/VC90/genrevision.vcproj
+++ b/win/VC90/genrevision.vcproj
@@ -44,11 +44,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -118,11 +118,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -139,7 +139,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="17"
@@ -193,9 +193,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -269,10 +270,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="false"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index ac9a48e09ca..2c7310a7929 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -49,17 +49,17 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -132,17 +132,17 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -214,16 +214,17 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -296,16 +297,17 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
diff --git a/win/VC90/worldserver.vcproj b/win/VC90/worldserver.vcproj
new file mode 100644
index 00000000000..358af471057
--- /dev/null
+++ b/win/VC90/worldserver.vcproj
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="worldserver"
+	ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}"
+	RootNamespace="trinitycore"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="1"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="true"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				LargeAddressAware="2"
+				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)\TrinityCore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)\TrinityCore.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
+				IgnoreStandardIncludePath="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				Version=""
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				LargeAddressAware="2"
+				RandomizedBaseAddress="1"
+				FixedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)\TrinityCore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
+				IgnoreStandardIncludePath="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib"
+				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
+				Version=""
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
+				GenerateMapFile="true"
+				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).map"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				FixedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)\TrinityCore.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="doc"
+			>
+			<File
+				RelativePath="..\..\COPYING"
+				>
+			</File>
+			<File
+				RelativePath="..\..\README"
+				>
+			</File>
+			<File
+				RelativePath="..\..\README.AHBOT"
+				>
+			</File>
+			<File
+				RelativePath="..\..\THANKS"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\src\server\worldserver\CommandLine\CliRunnable.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\CommandLine\CliRunnable.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\Main.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\Master.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\Master.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\RemoteAccess\RASocket.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\RemoteAccess\RASocket.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\resource.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\shared\Debugging\WheatyExceptionReport.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\WorldThread\WorldRunnable.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\WorldThread\WorldRunnable.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\server\worldserver\worldserver.rc"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
-- 
cgit v1.2.3


From 0b2dad9c9750be653ed61ac4dae2debfe3825011 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Thu, 24 Jun 2010 17:32:50 +0200
Subject: Remove a possible NaN-value in WorldObject::HasInArc (thanks to
 arrai) + do some hack'n'slash-work on the CMakeLists with my trusted axe ( I
 just LOVE being a viking - I get to wield an axe for free!)

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt       |   5 -
 src/server/collision/CMakeLists.txt        |  10 --
 src/server/game/CMakeLists.txt             | 159 -----------------------------
 src/server/game/Entities/Object/Object.cpp |  21 +---
 src/server/game/Maps/MapManager.h          |  15 +++
 src/server/scripts/CMakeLists.txt          |   7 --
 src/server/shared/CMakeLists.txt           |  32 ------
 src/server/worldserver/CMakeLists.txt      |   4 -
 8 files changed, 19 insertions(+), 234 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 6cfefb69443..82a94a5137d 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -12,14 +12,9 @@
 
 set(authserver_SRCS
   Authentication/AuthCodes.cpp
-  Authentication/AuthCodes.h
   Realms/RealmList.cpp
-  Realms/RealmList.h
   Server/AuthSocket.cpp
-  Server/AuthSocket.h
-  Server/RealmSocket.h
   Server/RealmSocket.cpp
-  Server/RealmAcceptor.h
   Main.cpp
 )
 
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index b71f19496fe..4749d88b100 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -11,23 +11,13 @@
 ########### collision ###############
 
 set(collision_STAT_SRCS
-  BoundingIntervalHierarchy.h
   BoundingIntervalHierarchy.cpp
   Maps/MapTree.cpp
-  Maps/MapTree.h
   Maps/TileAssembler.cpp
-  Maps/TileAssembler.h
   Models/ModelInstance.cpp
-  Models/ModelInstance.h
   Models/WorldModel.cpp
-  Models/WorldModel.h
-  Management/IVMapManager.h
   Management/VMapFactory.cpp
-  Management/VMapFactory.h
   Management/VMapManager2.cpp
-  Management/VMapManager2.h
-  VMapDefinitions.h
-  VMapTools.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 387b2365f47..2d6788cf36d 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -18,78 +18,41 @@ endif()
 # Create game-libary
 set(game_STAT_SRCS
   Accounts/AccountMgr.cpp
-  Accounts/AccountMgr.h
-  Achievements/AchievementMgr.h
   Achievements/AchievementMgr.cpp
   Addons/AddonMgr.cpp
-  Addons/AddonMgr.h
   AI/CoreAI/CombatAI.cpp
-  AI/CoreAI/CombatAI.h
   AI/CoreAI/GuardAI.cpp
-  AI/CoreAI/GuardAI.h
   AI/CoreAI/PassiveAI.cpp
-  AI/CoreAI/PassiveAI.h
   AI/CoreAI/PetAI.cpp
-  AI/CoreAI/PetAI.h
   AI/CoreAI/ReactorAI.cpp
-  AI/CoreAI/ReactorAI.h
   AI/CoreAI/TotemAI.cpp
-  AI/CoreAI/TotemAI.h
   AI/CoreAI/UnitAI.cpp
-  AI/CoreAI/UnitAI.h
   AI/EventAI/CreatureEventAI.cpp
   AI/EventAI/CreatureEventAIMgr.cpp
   AI/ScriptedAI/ScriptedSmartAI.cpp
-  AI/ScriptedAI/ScriptedSmartAI.h
-  AI/CreatureAIFactory.h
-  AI/CreatureAIImpl.h
   AI/CreatureAIRegistry.cpp
-  AI/CreatureAIRegistry.h
   AI/CreatureAISelector.cpp
-  AI/CreatureAISelector.h
   AI/CreatureAI.cpp
-  AI/CreatureAI.h
   AuctionHouse/AuctionHouseMgr.cpp
-  AuctionHouse/AuctionHouseMgr.h
   AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
-  AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
   BattleGrounds/ArenaTeam.cpp
-  BattleGrounds/ArenaTeam.h
   BattleGrounds/Zones/BattleGroundAA.cpp
-  BattleGrounds/Zones/BattleGroundAA.h
   BattleGrounds/Zones/BattleGroundAB.cpp
-  BattleGrounds/Zones/BattleGroundAB.h
   BattleGrounds/Zones/BattleGroundRB.cpp
-  BattleGrounds/Zones/BattleGroundRB.h
   BattleGrounds/Zones/BattleGroundAV.cpp
-  BattleGrounds/Zones/BattleGroundAV.h
   BattleGrounds/Zones/BattleGroundBE.cpp
-  BattleGrounds/Zones/BattleGroundBE.h
   BattleGrounds/Zones/BattleGroundDS.cpp
-  BattleGrounds/Zones/BattleGroundDS.h
   BattleGrounds/Zones/BattleGroundEY.cpp
-  BattleGrounds/Zones/BattleGroundEY.h
   BattleGrounds/Zones/BattleGroundIC.cpp
-  BattleGrounds/Zones/BattleGroundIC.h
   BattleGrounds/Zones/BattleGroundNA.cpp
-  BattleGrounds/Zones/BattleGroundNA.h
   BattleGrounds/Zones/BattleGroundRL.cpp
-  BattleGrounds/Zones/BattleGroundRL.h
   BattleGrounds/Zones/BattleGroundRV.cpp
-  BattleGrounds/Zones/BattleGroundRV.h
   BattleGrounds/Zones/BattleGroundSA.cpp
-  BattleGrounds/Zones/BattleGroundSA.h
   BattleGrounds/Zones/BattleGroundWS.cpp
-  BattleGrounds/Zones/BattleGroundWS.h
   BattleGrounds/BattleGround.cpp
-  BattleGrounds/BattleGround.h
   BattleGrounds/BattleGroundMgr.cpp
-  BattleGrounds/BattleGroundMgr.h
   Calendar/Calendar.cpp
-  Calendar/Calendar.h
   Chat/Channels/Channel.cpp
-  Chat/Channels/Channel.h
-  Chat/Channels/ChannelMgr.h
   Chat/Channels/ChannelMgr.cpp
   Chat/Commands/Debugcmds.cpp
   Chat/Commands/Level0.cpp
@@ -97,176 +60,78 @@ set(game_STAT_SRCS
   Chat/Commands/Level2.cpp
   Chat/Commands/Level3.cpp
   Chat/Chat.cpp
-  Chat/Chat.h
   Combat/HostileRefManager.cpp
-  Combat/HostileRefManager.h
   Combat/ThreatManager.cpp
-  Combat/ThreatManager.h
-  Combat/UnitEvents.h
   Conditions/ConditionMgr.cpp
-  Conditions/ConditionMgr.h
-  DataStores/DBCEnums.h
   DataStores/DBCStores.cpp
-  DataStores/DBCStores.h
-  DataStores/DBCStructure.h
-  DataStores/DBCfmt.h
-  DungeonFinding/LFG.h
   DungeonFinding/LFGMgr.cpp
-  DungeonFinding/LFGMgr.h
   Entities/Corpse/Corpse.cpp
-  Entities/Corpse/Corpse.h
   Entities/Creature/Creature.cpp
-  Entities/Creature/Creature.h
   Entities/Creature/CreatureGroups.cpp
-  Entities/Creature/CreatureGroups.h
   Entities/Creature/GossipDef.cpp
-  Entities/Creature/GossipDef.h
   Entities/Creature/TemporarySummon.cpp
-  Entities/Creature/TemporarySummon.h
   Entities/DynamicObject/DynamicObject.cpp
-  Entities/DynamicObject/DynamicObject.h
   Entities/GameObject/GameObject.cpp
-  Entities/GameObject/GameObject.h
   Entities/Item/Container/Bag.cpp
-  Entities/Item/Container/Bag.h
   Entities/Item/Item.cpp
-  Entities/Item/Item.h
   Entities/Item/ItemEnchantmentMgr.cpp
-  Entities/Item/ItemEnchantmentMgr.h
-  Entities/Item/ItemPrototype.h
   Entities/Object/Updates/UpdateData.cpp
-  Entities/Object/Updates/UpdateData.h
-  Entities/Object/Updates/UpdateFields.h
-  Entities/Object/Updates/UpdateMask.h
-  Entities/Object/ObjectDefines.h
   Entities/Object/Object.cpp
-  Entities/Object/Object.h
   Entities/Object/ObjectPosSelector.cpp
-  Entities/Object/ObjectPosSelector.h
   Entities/Pet/Pet.cpp
-  Entities/Pet/Pet.h
   Entities/Player/Player.cpp
-  Entities/Player/Player.h
   Entities/Player/SocialMgr.cpp
-  Entities/Player/SocialMgr.h
   Entities/Unit/StatSystem.cpp
   Entities/Unit/Unit.cpp
-  Entities/Unit/Unit.h
   Entities/Totem/Totem.cpp
-  Entities/Totem/Totem.h
   Entities/Transport/Transport.cpp
-  Entities/Transport/Transport.h
   Entities/Vehicle/Vehicle.cpp
-  Entities/Vehicle/Vehicle.h
   Events/GameEventMgr.cpp
-  Events/GameEventMgr.h
   Globals/GlobalEvents.cpp
-  Globals/GlobalEvents.h
   Globals/ObjectAccessor.cpp
-  Globals/ObjectAccessor.h
   Globals/ObjectMgr.cpp
-  Globals/ObjectMgr.h
-  Grids/Cells/Cell.h
-  Grids/Cells/CellImpl.h
   Grids/Notifiers/GridNotifiers.cpp
-  Grids/Notifiers/GridNotifiers.h
-  Grids/Notifiers/GridNotifiersImpl.h
-  Grids/GridDefines.h
   Grids/GridStates.cpp
-  Grids/GridStates.h
   Grids/ObjectGridLoader.cpp
-  Grids/ObjectGridLoader.h
   Groups/Group.cpp
-  Groups/Group.h
   Groups/GroupReference.cpp
-  Groups/GroupReference.h
-  Groups/GroupRefManager.h
   Guilds/Guild.cpp
-  Guilds/Guild.h
   Instances/InstanceData.cpp
-  Instances/InstanceData.h
   Instances/InstanceSaveMgr.cpp
-  Instances/InstanceSaveMgr.h
   Loot/LootMgr.cpp
-  Loot/LootMgr.h
   Mails/Mail.cpp
-  Mails/Mail.h
   Maps/Map.cpp
-  Maps/Map.h
   Maps/MapInstanced.cpp
-  Maps/MapInstanced.h
   Maps/MapManager.cpp
-  Maps/MapManager.h
   Maps/MapUpdater.cpp
-  Maps/MapUpdater.h
-  Maps/MapReference.h
-  Maps/MapRefManager.h
-  Maps/ZoneScript.h
-  Miscellaneous/Formulas.h
-  Miscellaneous/Language.h
-  Miscellaneous/SharedDefines.h
   Movement/MovementGenerators/ConfusedMovementGenerator.cpp
-  Movement/MovementGenerators/ConfusedMovementGenerator.h
   Movement/MovementGenerators/FleeingMovementGenerator.cpp
-  Movement/MovementGenerators/FleeingMovementGenerator.h
   Movement/MovementGenerators/HomeMovementGenerator.cpp
-  Movement/MovementGenerators/HomeMovementGenerator.h
   Movement/MovementGenerators/IdleMovementGenerator.cpp
-  Movement/MovementGenerators/IdleMovementGenerator.h
   Movement/MovementGenerators/PointMovementGenerator.cpp
-  Movement/MovementGenerators/PointMovementGenerator.h
   Movement/MovementGenerators/RandomMovementGenerator.cpp
-  Movement/MovementGenerators/RandomMovementGenerator.h
   Movement/MovementGenerators/TargetedMovementGenerator.cpp
-  Movement/MovementGenerators/TargetedMovementGenerator.h
   Movement/MovementGenerators/WaypointMovementGenerator.cpp
-  Movement/MovementGenerators/WaypointMovementGenerator.h
-  Movement/Waypoints/Path.h
   Movement/Waypoints/WaypointManager.cpp
-  Movement/Waypoints/WaypointManager.h
   Movement/DestinationHolder.cpp
-  Movement/DestinationHolder.h
-  Movement/DestinationHolderImp.h
   Movement/FollowerReference.cpp
-  Movement/FollowerReference.h
-  Movement/FollowerRefManager.h
   Movement/MotionMaster.cpp
-  Movement/MotionMaster.h
   Movement/MovementGenerator.cpp
-  Movement/MovementGenerator.h
-  Movement/MovementGeneratorImpl.h
-  Movement/Traveller.h
   OutdoorPvP/Zones/OutdoorPvPEP.cpp
-  OutdoorPvP/Zones/OutdoorPvPEP.h
   OutdoorPvP/Zones/OutdoorPvPHP.cpp
-  OutdoorPvP/Zones/OutdoorPvPHP.h
   OutdoorPvP/Zones/OutdoorPvPNA.cpp
-  OutdoorPvP/Zones/OutdoorPvPNA.h
   OutdoorPvP/Zones/OutdoorPvPSI.cpp
-  OutdoorPvP/Zones/OutdoorPvPSI.h
   OutdoorPvP/Zones/OutdoorPvPTF.cpp
-  OutdoorPvP/Zones/OutdoorPvPTF.h
   OutdoorPvP/Zones/OutdoorPvPZM.cpp
-  OutdoorPvP/Zones/OutdoorPvPZM.h
   OutdoorPvP/OutdoorPvP.cpp
-  OutdoorPvP/OutdoorPvP.h
-  OutdoorPvP/OutdoorPvPImpl.h
   OutdoorPvP/OutdoorPvPMgr.cpp
-  OutdoorPvP/OutdoorPvPMgr.h
   Pools/PoolHandler.cpp
-  Pools/PoolHandler.h
   Quests/QuestDef.cpp
-  Quests/QuestDef.h
   Reputation/ReputationMgr.cpp
-  Reputation/ReputationMgr.h
   Scripting/ScriptLoader.cpp
-  Scripting/ScriptLoader.h
   Scripting/ScriptMgr.cpp
-  Scripting/ScriptMgr.h
   Scripting/ScriptSystem.cpp
-  Scripting/ScriptSystem.h
   Server/Protocol/Handlers/AddonHandler.cpp
-  Server/Protocol/Handlers/AddonHandler.h
   Server/Protocol/Handlers/ArenaTeamHandler.cpp
   Server/Protocol/Handlers/AuctionHouseHandler.cpp
   Server/Protocol/Handlers/BattleGroundHandler.cpp
@@ -284,7 +149,6 @@ set(game_STAT_SRCS
   Server/Protocol/Handlers/MiscHandler.cpp
   Server/Protocol/Handlers/MovementHandler.cpp
   Server/Protocol/Handlers/NPCHandler.cpp
-  Server/Protocol/Handlers/NPCHandler.h
   Server/Protocol/Handlers/PetHandler.cpp
   Server/Protocol/Handlers/PetitionsHandler.cpp
   Server/Protocol/Handlers/QueryHandler.cpp
@@ -296,37 +160,21 @@ set(game_STAT_SRCS
   Server/Protocol/Handlers/TradeHandler.cpp
   Server/Protocol/Handlers/VoiceChatHandler.cpp
   Server/Protocol/Opcodes.cpp
-  Server/Protocol/Opcodes.h
   Server/Protocol/WorldLog.cpp
-  Server/Protocol/WorldLog.h
   Server/WorldSession.cpp
-  Server/WorldSession.h
   Server/WorldSocket.cpp
-  Server/WorldSocket.h
   Server/WorldSocketMgr.cpp
-  Server/WorldSocketMgr.h
   Skills/SkillDiscovery.cpp
-  Skills/SkillDiscovery.h
   Skills/SkillExtraItems.cpp
-  Skills/SkillExtraItems.h
-  Spells/Auras/SpellAuraDefines.h
   Spells/Auras/SpellAuras.cpp
-  Spells/Auras/SpellAuras.h
   Spells/Auras/SpellAuraEffects.cpp
-  Spells/Auras/SpellAuraEffects.h
   Spells/Auras/SpellEffects.cpp
   Spells/Spell.cpp
-  Spells/Spell.h
   Spells/SpellMgr.cpp
-  Spells/SpellMgr.h
   Tools/PlayerDump.cpp
-  Tools/PlayerDump.h
   Tools/Tools.cpp
-  Tools/Tools.h
   Weather/Weather.cpp
-  Weather/Weather.h
   World/World.cpp
-  World/World.h
 )
 
 include_directories(
@@ -423,17 +271,10 @@ include_directories(
 if(NOT DO_SCRIPTS)
   set(game_STAT_SRCS ${game_STAT_SRCS}
     AI/ScriptedAI/ScriptedEscortAI.cpp
-    AI/ScriptedAI/ScriptedEscortAI.h
     AI/ScriptedAI/ScriptedCreature.cpp
-    AI/ScriptedAI/ScriptedCreature.h
     AI/ScriptedAI/ScriptedFollowerAI.cpp
-    AI/ScriptedAI/ScriptedFollowerAI.h
-    AI/ScriptedAI/ScriptedGossip.h
     AI/ScriptedAI/ScriptedGuardAI.cpp
-    AI/ScriptedAI/ScriptedGuardAI.h
-    AI/ScriptedAI/ScriptedInstance.h
     AI/ScriptedAI/ScriptedSimpleAI.cpp
-    AI/ScriptedAI/ScriptedSimpleAI.h
   )
   message("-- Added basic scriptAI-engines to GAME library")
 endif()
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index e401051b7cb..4e32b48d6b8 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1379,28 +1379,15 @@ bool Position::HasInArc(float arc, const Position *obj) const
         return true;
 
     // move arc to range 0.. 2*pi
-    while (arc >= 2.0f * M_PI)
-        arc -=  2.0f * M_PI;
-    while (arc < 0)
-        arc +=  2.0f * M_PI;
+    arc = MapManager::NormalizeOrientation(arc);
 
     float angle = GetAngle(obj);
     angle -= m_orientation;
 
-    //if (angle > 100 || angle < -100)
-    //{
-    //    sLog.outCrash("Invalid Angle %f: this %u %u %f %f %f %f, that %u %u %f %f %f %f", angle,
-    //        GetEntry(), GetGUIDLow(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),
-    //        obj->GetEntry(), obj->GetGUIDLow(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation());
-    //    assert(false);
-    //    return false;
-    //}
-
     // move angle to range -pi ... +pi
-    while (angle > M_PI)
-        angle -= 2.0f * M_PI;
-    while (angle < -M_PI)
-        angle += 2.0f * M_PI;
+    angle = MapManager::NormalizeOrientation(angle);
+    if(angle > M_PI)
+        angle -= 2.0f*M_PI;
 
     float lborder =  -1 * (arc/2.0f);                       // in range -pi..0
     float rborder = (arc/2.0f);                             // in range 0..pi
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 0fd13f72af2..52f38c54eb2 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -108,6 +108,21 @@ class MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLock
             return IsValidMapCoord(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ(), loc.GetOrientation());
         }
 
+        // modulos a radian orientation to the range of 0..2PI
+        static float NormalizeOrientation(float o)
+        {
+            // fmod only supports positive numbers. Thus we have
+            // to emulate negative numbers
+            if(o < 0)
+            {
+                float mod = o *-1;
+                mod = fmod(mod, 2.0f*M_PI);
+                mod = -mod+2.0f*M_PI;
+                return mod;
+            }
+            return fmod(o, 2.0f*M_PI);
+        }
+
         void DoDelayedMovesAndRemoves();
 
         void LoadTransports();
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 7d10625e9d6..151e843fa96 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -26,17 +26,10 @@ set(scripts_STAT_SRCS
   ../game/PrecompiledHeaders/ScriptPCH.cpp
   ../game/PrecompiledHeaders/ScriptPCH.h
   ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
-  ../game/AI/ScriptedAI/ScriptedEscortAI.h
   ../game/AI/ScriptedAI/ScriptedCreature.cpp
-  ../game/AI/ScriptedAI/ScriptedCreature.h
   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
-  ../game/AI/ScriptedAI/ScriptedFollowerAI.h
-  ../game/AI/ScriptedAI/ScriptedGossip.h
   ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
-  ../game/AI/ScriptedAI/ScriptedGuardAI.h
-  ../game/AI/ScriptedAI/ScriptedInstance.h
   ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
-  ../game/AI/ScriptedAI/ScriptedSimpleAI.h
   Custom/on_events.cpp
   ${scripts_easternkingdoms}
   ${scripts_kalimdor}
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index c815ddb9902..04fbfbea60f 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -11,26 +11,14 @@
 ########### shared ###############
 
 set(shared_STAT_SRCS
-  Debugging/Errors.h
   Logging/Log.cpp
-  Logging/Log.h
-  Packets/ByteBuffer.h
-  Packets/WorldPacket.h
   Policies/ObjectLifeTime.cpp
   Threading/DelayExecutor.cpp
-  Threading/DelayExecutor.h
   Threading/Threading.cpp
   Utilities/ProgressBar.cpp
-  Utilities/ProgressBar.h
-  Utilities/SignalHandler.h
-  Utilities/Timer.h
   Utilities/Util.cpp
-  Utilities/Util.h  
   Utilities/EventProcessor.cpp
-  Utilities/EventProcessor.h
   Common.cpp
-  Common.h
-  SystemConfig.h
 )
 
 include_directories(
@@ -66,12 +54,8 @@ target_link_libraries(
 
 set(trinityconfig_STAT_SRCS
   Configuration/dotconfpp/dotconfpp.cpp
-  Configuration/dotconfpp/dotconfpp.h
   Configuration/dotconfpp/mempool.cpp
-  Configuration/dotconfpp/mempool.h
   Configuration/Config.cpp
-  Configuration/Config.h
-  Configuration/ConfigEnv.h
 )
 
 include_directories(
@@ -86,17 +70,11 @@ add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
 
 set(trinityauth_STAT_SRCS
   Cryptography/Authentication/AuthCrypt.cpp
-  Cryptography/Authentication/AuthCrypt.h
   Cryptography/BigNumber.cpp
-  Cryptography/BigNumber.h
   Cryptography/HMACSHA1.cpp
-  Cryptography/HMACSHA1.h
   Cryptography/SHA1.cpp
-  Cryptography/SHA1.h
   Cryptography/MD5.c
-  Cryptography/MD5.h
   Cryptography/ARC4.cpp
-  Cryptography/ARC4.h
 )
 
 include_directories(
@@ -112,22 +90,12 @@ add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
 
 set(trinitydatabase_STAT_SRCS
   DataStores/DBCFileLoader.cpp
-  DataStores/DBCFileLoader.h
-  DataStores/DBCStore.h
   Database/Database.cpp
-  Database/Database.h
-  Database/DatabaseEnv.h
-  Database/DatabaseImpl.h
   Database/Field.cpp
-  Database/Field.h
   Database/QueryResult.cpp
-  Database/QueryResult.h
   Database/SQLStorage.cpp
-  Database/SQLStorage.h
   Database/SqlDelayThread.cpp
-  Database/SqlDelayThread.h
   Database/SqlOperations.cpp
-  Database/SqlOperations.h
 )
 
 include_directories(
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 973cdaec200..cc221f314e0 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -12,14 +12,10 @@
 
 set(worldserver_SRCS
   CommandLine/CliRunnable.cpp
-  CommandLine/CliRunnable.h
   RemoteAccess/RASocket.cpp
-  RemoteAccess/RASocket.h
   WorldThread/WorldRunnable.cpp
-  WorldThread/WorldRunnable.h
   Main.cpp
   Master.cpp
-  Master.h
 )
 
 include_directories(
-- 
cgit v1.2.3


From 0f7657b68c8b6444fadb480cdd0f87631391afa5 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Fri, 25 Jun 2010 00:18:01 +0200
Subject: Get rid of Trinity Singleton and Threading patterns and replace them
 with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es
 respectively. Also get rid of unused CountedReference class that used Trinity
 threading pattern.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/AI/CreatureAISelector.cpp          |   9 +-
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp  |   3 -
 src/server/game/AI/EventAI/CreatureEventAIMgr.h    |   5 +-
 src/server/game/Accounts/AccountMgr.cpp            |   4 +-
 src/server/game/Accounts/AccountMgr.h              |   3 +-
 src/server/game/Achievements/AchievementMgr.cpp    |   6 +-
 src/server/game/Achievements/AchievementMgr.h      |   4 +-
 src/server/game/Addons/AddonMgr.cpp                |   4 +-
 src/server/game/Addons/AddonMgr.h                  |   7 +-
 .../AuctionHouseBot/AuctionHouseBot.cpp            |   7 +-
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h |   6 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   |   4 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.h     |  66 +++++-----
 src/server/game/BattleGrounds/BattleGround.cpp     |   4 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp  |   6 +-
 src/server/game/BattleGrounds/BattleGroundMgr.h    |  11 +-
 src/server/game/Chat/Channels/ChannelMgr.cpp       |  11 +-
 src/server/game/Chat/Channels/ChannelMgr.h         |   2 +-
 src/server/game/Chat/Commands/Level0.cpp           |   4 +-
 src/server/game/Chat/Commands/Level1.cpp           |  10 +-
 src/server/game/Chat/Commands/Level2.cpp           |   2 +-
 src/server/game/Chat/Commands/Level3.cpp           |  12 +-
 src/server/game/Conditions/ConditionMgr.cpp        |   4 +-
 src/server/game/Conditions/ConditionMgr.h          |   6 +-
 src/server/game/DataStores/DBCStores.cpp           |   2 +-
 src/server/game/DungeonFinding/LFGMgr.cpp          |   4 +-
 src/server/game/DungeonFinding/LFGMgr.h            |  65 +++++-----
 src/server/game/Entities/Corpse/Corpse.cpp         |   4 +-
 src/server/game/Entities/Creature/Creature.cpp     |   8 +-
 src/server/game/Entities/Creature/Creature.h       |   2 +-
 .../game/Entities/Creature/CreatureGroups.cpp      |   4 +-
 src/server/game/Entities/Creature/CreatureGroups.h |   5 +-
 .../game/Entities/DynamicObject/DynamicObject.cpp  |   4 +-
 src/server/game/Entities/GameObject/GameObject.cpp |   4 +-
 src/server/game/Entities/Object/Object.cpp         |  30 ++---
 src/server/game/Entities/Pet/Pet.cpp               |   4 +-
 src/server/game/Entities/Player/Player.cpp         |  36 +++---
 src/server/game/Entities/Player/SocialMgr.cpp      |   4 +-
 src/server/game/Entities/Player/SocialMgr.h        |   7 +-
 src/server/game/Entities/Transport/Transport.cpp   |   4 +-
 src/server/game/Entities/Unit/Unit.cpp             |   2 +-
 src/server/game/Events/GameEventMgr.cpp            |  13 +-
 src/server/game/Events/GameEventMgr.h              |   8 +-
 src/server/game/Globals/GlobalEvents.cpp           |   4 +-
 src/server/game/Globals/ObjectAccessor.cpp         |  22 ++--
 src/server/game/Globals/ObjectAccessor.h           |  21 ++--
 src/server/game/Globals/ObjectMgr.cpp              |  14 +--
 src/server/game/Globals/ObjectMgr.h                |  14 +--
 src/server/game/Grids/Grid.h                       |   7 +-
 src/server/game/Grids/NGrid.h                      |   9 +-
 src/server/game/Grids/ObjectGridLoader.cpp         |   2 +-
 src/server/game/Groups/Group.cpp                   |   2 +-
 src/server/game/Instances/InstanceSaveMgr.cpp      |  14 +--
 src/server/game/Instances/InstanceSaveMgr.h        |  12 +-
 src/server/game/Maps/Map.cpp                       |  20 ++--
 src/server/game/Maps/Map.h                         |   5 +-
 src/server/game/Maps/MapInstanced.cpp              |   6 +-
 src/server/game/Maps/MapManager.cpp                |  15 +--
 src/server/game/Maps/MapManager.h                  |  10 +-
 src/server/game/Movement/MovementGenerator.h       |   2 +-
 .../WaypointMovementGenerator.cpp                  |   2 +-
 src/server/game/OutdoorPvP/OutdoorPvP.cpp          |   2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp       |   3 -
 src/server/game/OutdoorPvP/OutdoorPvPMgr.h         |   4 +-
 src/server/game/Pools/PoolHandler.cpp              |  15 +--
 src/server/game/Pools/PoolHandler.h                |  11 +-
 src/server/game/Scripting/ScriptMgr.cpp            |   3 -
 src/server/game/Scripting/ScriptMgr.h              |   5 +-
 .../game/Server/Protocol/Handlers/AddonHandler.cpp |   5 -
 .../game/Server/Protocol/Handlers/AddonHandler.h   |  13 +-
 .../Server/Protocol/Handlers/ArenaTeamHandler.cpp  |   2 +-
 .../Server/Protocol/Handlers/ChannelHandler.cpp    |   2 -
 .../Server/Protocol/Handlers/CharacterHandler.cpp  |   2 +-
 .../game/Server/Protocol/Handlers/GuildHandler.cpp |   2 +-
 .../game/Server/Protocol/Handlers/MiscHandler.cpp  |   6 +-
 .../Server/Protocol/Handlers/MovementHandler.cpp   |   4 +-
 .../game/Server/Protocol/Handlers/QueryHandler.cpp |   2 +-
 src/server/game/Server/Protocol/WorldLog.cpp       |  12 +-
 src/server/game/Server/Protocol/WorldLog.h         |  10 +-
 src/server/game/Skills/SkillDiscovery.cpp          |   1 -
 src/server/game/Spells/Spell.cpp                   |   1 -
 src/server/game/Spells/SpellMgr.cpp                |   2 +-
 src/server/game/World/World.cpp                    |  15 +--
 src/server/game/World/World.h                      |   4 +-
 .../BlackwingLair/boss_victor_nefarius.cpp         |   6 +-
 src/server/shared/CMakeLists.txt                   |   2 -
 src/server/shared/Configuration/Config.cpp         |   3 -
 src/server/shared/Configuration/Config.h           |   7 +-
 src/server/shared/Database/Database.cpp            |   1 -
 src/server/shared/Database/Database.h              |   1 -
 src/server/shared/Debugging/MemoryLeaks.cpp        |   3 -
 src/server/shared/Debugging/MemoryLeaks.h          |   5 +-
 .../shared/Dynamic/CountedReference/Reference.h    | 100 ----------------
 .../Dynamic/CountedReference/ReferenceHolder.h     |  42 -------
 .../Dynamic/CountedReference/ReferenceImpl.h       | 133 ---------------------
 src/server/shared/Dynamic/FactoryHolder.h          |   8 +-
 src/server/shared/Dynamic/ObjectRegistry.h         |  10 +-
 src/server/shared/Logging/Log.cpp                  |   3 -
 src/server/shared/Logging/Log.h                    |  10 +-
 src/server/shared/Policies/CreationPolicy.h        | 110 -----------------
 src/server/shared/Policies/ObjectLifeTime.cpp      |  36 ------
 src/server/shared/Policies/ObjectLifeTime.h        |  53 --------
 src/server/shared/Policies/Singleton.h             |  65 ----------
 src/server/shared/Policies/SingletonImp.h          |  93 --------------
 src/server/shared/Policies/ThreadingModel.h        | 130 --------------------
 src/server/worldserver/Master.cpp                  |   3 -
 src/server/worldserver/Master.h                    |   3 +-
 .../worldserver/WorldThread/WorldRunnable.cpp      |   2 +-
 win/VC90/shared.vcproj                             |  24 ----
 109 files changed, 349 insertions(+), 1221 deletions(-)
 delete mode 100644 src/server/shared/Dynamic/CountedReference/Reference.h
 delete mode 100644 src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
 delete mode 100644 src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
 delete mode 100644 src/server/shared/Policies/CreationPolicy.h
 delete mode 100644 src/server/shared/Policies/ObjectLifeTime.cpp
 delete mode 100644 src/server/shared/Policies/ObjectLifeTime.h
 delete mode 100644 src/server/shared/Policies/Singleton.h
 delete mode 100644 src/server/shared/Policies/SingletonImp.h
 delete mode 100644 src/server/shared/Policies/ThreadingModel.h

(limited to 'src/server/shared')

diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 79977fab5b1..8283baf87f9 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -21,22 +21,19 @@
 #include "Creature.h"
 #include "CreatureAISelector.h"
 #include "PassiveAI.h"
-#include "SingletonImp.h"
+
 #include "MovementGenerator.h"
 #include "Pet.h"
 #include "TemporarySummon.h"
 #include "CreatureAIFactory.h"
 #include "ScriptMgr.h"
 
-INSTANTIATE_SINGLETON_1(CreatureAIRegistry);
-INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry);
-
 namespace FactorySelector
 {
     CreatureAI* selectAI(Creature *creature)
     {
         const CreatureAICreator *ai_factory = NULL;
-        CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance());
+        CreatureAIRegistry& ai_registry(*CreatureAIRepository::instance());
 
         if (creature->isPet())
             ai_factory = ai_registry.GetRegistryItem("PetAI");
@@ -106,7 +103,7 @@ namespace FactorySelector
 
     MovementGenerator* selectMovementGenerator(Creature *creature)
     {
-        MovementGeneratorRegistry &mv_registry(MovementGeneratorRepository::Instance());
+        MovementGeneratorRegistry& mv_registry(*MovementGeneratorRepository::instance());
         assert(creature->GetCreatureInfo() != NULL);
         const MovementGeneratorCreator *mv_factory = mv_registry.GetRegistryItem(creature->GetDefaultMovementType());
 
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 8c71f5e5765..9f4105050ae 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -23,13 +23,10 @@
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
 #include "ObjectDefines.h"
 #include "GridDefines.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
-
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Texts()
 {
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.h b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
index ef191b22463..3c8181e9e74 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.h
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
@@ -24,8 +24,9 @@
 
 class CreatureEventAIMgr
 {
+    friend class ACE_Singleton<CreatureEventAIMgr, ACE_Null_Mutex>;
+    CreatureEventAIMgr(){};
     public:
-        CreatureEventAIMgr(){};
         ~CreatureEventAIMgr(){};
 
         void LoadCreatureEventAI_Texts();
@@ -42,5 +43,5 @@ class CreatureEventAIMgr
         CreatureEventAI_TextMap    m_CreatureEventAI_TextMap;
 };
 
-#define CreatureEAI_Mgr Trinity::Singleton<CreatureEventAIMgr>::Instance()
+#define CreatureEAI_Mgr (*ACE_Singleton<CreatureEventAIMgr, ACE_Null_Mutex>::instance())
 #endif
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 18372677120..54f80114131 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
@@ -29,8 +29,6 @@
 
 extern DatabaseType LoginDatabase;
 
-INSTANTIATE_SINGLETON_1(AccountMgr);
-
 AccountMgr::AccountMgr()
 {}
 
diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index f770e24d902..a0e181cf4a0 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -24,7 +24,6 @@
 #include <string>
 
 #include "Common.h"
-#include "Singleton.h"
 
 enum AccountOpResult
 {
@@ -59,6 +58,6 @@ class AccountMgr
         static bool normalizeString(std::string& utf8str);
 };
 
-#define accmgr Trinity::Singleton<AccountMgr>::Instance()
+#define accmgr (*ACE_Singleton<AccountMgr, ACE_Null_Mutex>::instance())
 #endif
 
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 41b9acfff2c..137c22634fa 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
@@ -41,8 +41,6 @@
 #include "Map.h"
 #include "InstanceData.h"
 
-INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
-
 namespace Trinity
 {
     class AchievementChatBuilder
@@ -965,7 +963,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if (!miscvalue1)
                     continue;
 
-                Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : MapManager::Instance().FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
+                Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : sMapMgr.FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
                 if (!map || !map->IsDungeon())
                     continue;
 
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 97dbc86396e..0eedf971c20 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -22,7 +22,7 @@
 #include <string>
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
@@ -342,6 +342,6 @@ class AchievementGlobalMgr
         AchievementRewardLocales m_achievementRewardLocales;
 };
 
-#define achievementmgr Trinity::Singleton<AchievementGlobalMgr>::Instance()
+#define achievementmgr (*ACE_Singleton<AchievementGlobalMgr, ACE_Null_Mutex>::instance())
 
 #endif
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index b7b1d2e9333..9bc28f845ac 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
@@ -30,8 +30,6 @@
 
 extern DatabaseType LoginDatabase;
 
-INSTANTIATE_SINGLETON_1(AddonMgr);
-
 AddonMgr::AddonMgr()
 {
 }
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 0d648794416..90232cc3f2b 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -22,7 +22,7 @@
 #define _ADDONMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include <string>
 
@@ -68,9 +68,10 @@ typedef std::list<SavedAddon> SavedAddonsList;
 
 class AddonMgr
 {
+    friend class ACE_Singleton<AddonMgr, ACE_Null_Mutex>;
+    AddonMgr();
     public:
 
-        AddonMgr();
         ~AddonMgr();
 
         void LoadFromDB();
@@ -83,7 +84,7 @@ class AddonMgr
         SavedAddonsList m_knownAddons;                           // Known addons.
 };
 
-#define sAddonMgr Trinity::Singleton<AddonMgr>::Instance()
+#define sAddonMgr (*ACE_Singleton<AddonMgr, ACE_Null_Mutex>::instance())
 
 #endif
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
index e9cf8f21ab2..ce621e689cd 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
@@ -3,8 +3,7 @@
 #include "AuctionHouseBot.h"
 #include <vector>
 
-#include "SingletonImp.h"
-INSTANTIATE_SINGLETON_1(AuctionHouseBot);
+
 
 using namespace std;
 vector<uint32> npcItems;
@@ -693,7 +692,7 @@ void AuctionHouseBot::Update()
     WorldSession _session(AHBplayerAccount, NULL, SEC_PLAYER, true, 0, LOCALE_enUS);
     Player _AHBplayer(&_session);
     _AHBplayer.Initialize(AHBplayerGUID);
-    ObjectAccessor::Instance().AddObject(&_AHBplayer);
+    sObjectAccessor.AddObject(&_AHBplayer);
 
     // Add New Bids
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
@@ -725,7 +724,7 @@ void AuctionHouseBot::Update()
         addNewAuctionBuyerBotBid(&_AHBplayer, &NeutralConfig, &_session);
         _lastrun_n = _newrun;
     }
-    ObjectAccessor::Instance().RemoveObject(&_AHBplayer);
+    sObjectAccessor.RemoveObject(&_AHBplayer);
 }
 
 void AuctionHouseBot::Initialize()
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index f29a8762513..853955a43a0 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -1207,9 +1207,11 @@ private:
     inline uint32 minValue(uint32 a, uint32 b) { return a <= b ? a : b; };
     void addNewAuctions(Player *AHBplayer, AHBConfig *config);
     void addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *config, WorldSession *session);
+    
+    friend class ACE_Singleton<AuctionHouseBot, ACE_Null_Mutex>;
+    AuctionHouseBot();
 
 public:
-    AuctionHouseBot();
     ~AuctionHouseBot();
     void Update();
     void Initialize();
@@ -1220,6 +1222,6 @@ public:
     uint32 GetAHBplayerGUID() { return AHBplayerGUID; };
 };
 
-#define auctionbot Trinity::Singleton<AuctionHouseBot>::Instance()
+#define auctionbot (*ACE_Singleton<AuctionHouseBot, ACE_Null_Mutex>::instance())
 
 #endif
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 744df2cb6e7..38874336cc4 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -24,7 +24,7 @@
 #include "WorldSession.h"
 #include "DatabaseEnv.h"
 #include "SQLStorage.h"
-#include "SingletonImp.h"
+
 #include "DBCStores.h"
 
 #include "AccountMgr.h"
@@ -35,8 +35,6 @@
 #include "ProgressBar.h"
 #include <vector>
 
-INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
-
 using namespace std;
 
 AuctionHouseMgr::AuctionHouseMgr()
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 7048e419c36..f0eda8f4fc4 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -21,7 +21,7 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include "SharedDefines.h"
 
@@ -121,51 +121,53 @@ class AuctionHouseObject
 
 class AuctionHouseMgr
 {
-  public:
+    friend class ACE_Singleton<AuctionHouseMgr, ACE_Null_Mutex>;
     AuctionHouseMgr();
-    ~AuctionHouseMgr();
+    
+    public:
+        ~AuctionHouseMgr();
 
-    typedef UNORDERED_MAP<uint32, Item*> ItemMap;
+        typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
-    AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId);
-    AuctionHouseObject* GetBidsMap(uint32 factionTemplateId);
+        AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId);
+        AuctionHouseObject* GetBidsMap(uint32 factionTemplateId);
 
-    Item* GetAItem(uint32 id)
-    {
-        ItemMap::const_iterator itr = mAitems.find(id);
-        if (itr != mAitems.end())
+        Item* GetAItem(uint32 id)
         {
-            return itr->second;
+            ItemMap::const_iterator itr = mAitems.find(id);
+            if (itr != mAitems.end())
+            {
+                return itr->second;
+            }
+            return NULL;
         }
-        return NULL;
-    }
 
-    //auction messages
-    void SendAuctionWonMail(AuctionEntry * auction);
-    void SendAuctionSalePendingMail(AuctionEntry * auction);
-    void SendAuctionSuccessfulMail(AuctionEntry * auction);
-    void SendAuctionExpiredMail(AuctionEntry * auction);
-    static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
-    static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);
+        //auction messages
+        void SendAuctionWonMail(AuctionEntry * auction);
+        void SendAuctionSalePendingMail(AuctionEntry * auction);
+        void SendAuctionSuccessfulMail(AuctionEntry * auction);
+        void SendAuctionExpiredMail(AuctionEntry * auction);
+        static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
+        static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);
 
-  public:
+    public:
     //load first auction items, because of check if item exists, when loading
-    void LoadAuctionItems();
-    void LoadAuctions();
+        void LoadAuctionItems();
+        void LoadAuctions();
 
-    void AddAItem(Item* it);
-    bool RemoveAItem(uint32 id);
+        void AddAItem(Item* it);
+        bool RemoveAItem(uint32 id);
 
-    void Update();
+        void Update();
 
-  private:
-    AuctionHouseObject mHordeAuctions;
-    AuctionHouseObject mAllianceAuctions;
-    AuctionHouseObject mNeutralAuctions;
+    private:
+        AuctionHouseObject mHordeAuctions;
+        AuctionHouseObject mAllianceAuctions;
+        AuctionHouseObject mNeutralAuctions;
 
-    ItemMap mAitems;
+        ItemMap mAitems;
 };
 
-#define auctionmgr Trinity::Singleton<AuctionHouseMgr>::Instance()
+#define auctionmgr (*ACE_Singleton<AuctionHouseMgr, ACE_Null_Mutex>::instance())
 
 #endif
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 591417c8fea..86125ac5bfe 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -323,7 +323,7 @@ void BattleGround::Update(uint32 diff)
             plr->ResurrectPlayer(1.0f);
             plr->CastSpell(plr, 6962, true);
             plr->CastSpell(plr, SPELL_SPIRIT_HEAL_MANA, true);
-            ObjectAccessor::Instance().ConvertCorpseForPlayer(*itr);
+            sObjectAccessor.ConvertCorpseForPlayer(*itr);
         }
         m_ResurrectQueue.clear();
     }
@@ -1525,7 +1525,7 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
 /*
 void BattleGround::SpawnBGCreature(uint32 type, uint32 respawntime)
 {
-    Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceId());
+    Map * map = sMapMgr.FindMap(GetMapId(),GetInstanceId());
     if (!map)
         return false;
 
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index ea2d0c2f920..84891dcf2df 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -22,7 +22,7 @@
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "SingletonImp.h"
+
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
@@ -49,8 +49,6 @@
 #include "SharedDefines.h"
 #include "Formulas.h"
 
-INSTANTIATE_SINGLETON_1(BattleGroundMgr);
-
 /*********************************************************/
 /***            BATTLEGROUND QUEUE SYSTEM              ***/
 /*********************************************************/
@@ -1630,7 +1628,7 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
     }
 
     // generate a new instance id
-    bg->SetInstanceID(MapManager::Instance().GenerateInstanceId()); // set instance id
+    bg->SetInstanceID(sMapMgr.GenerateInstanceId()); // set instance id
     bg->SetClientInstanceID(CreateClientVisibleInstanceId(isRandom ? BATTLEGROUND_RB : bgTypeId, bracketEntry->GetBracketId()));
 
     // reset the new bg (set status to status_wait_queue from status_none)
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h
index 5319ce85752..40dfc39b5e5 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.h
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.h
@@ -22,7 +22,7 @@
 #define __BATTLEGROUNDMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include "DBCEnums.h"
 #include "BattleGround.h"
@@ -180,9 +180,12 @@ class BGQueueRemoveEvent : public BasicEvent
 
 class BattleGroundMgr
 {
+    /// Todo: Thread safety?
+    /* Construction */
+    friend class ACE_Singleton<BattleGroundMgr, ACE_Null_Mutex>;
+    BattleGroundMgr();
+    
     public:
-        /* Construction */
-        BattleGroundMgr();
         ~BattleGroundMgr();
         void Update(uint32 diff);
 
@@ -271,6 +274,6 @@ class BattleGroundMgr
         bool   m_Testing;
 };
 
-#define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance()
+#define sBattleGroundMgr (*ACE_Singleton<BattleGroundMgr, ACE_Null_Mutex>::instance())
 #endif
 
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index b26a42aa2b1..b72a2698d3a 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -17,21 +17,18 @@
  */
 
 #include "ChannelMgr.h"
-#include "SingletonImp.h"
-#include "World.h"
 
-INSTANTIATE_SINGLETON_1(AllianceChannelMgr);
-INSTANTIATE_SINGLETON_1(HordeChannelMgr);
+#include "World.h"
 
 ChannelMgr* channelMgr(uint32 team)
 {
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
-        return &Trinity::Singleton<AllianceChannelMgr>::Instance();        // cross-faction
+        return ACE_Singleton<AllianceChannelMgr, ACE_Null_Mutex>::instance();        // cross-faction
 
     if (team == ALLIANCE)
-        return &Trinity::Singleton<AllianceChannelMgr>::Instance();
+        return ACE_Singleton<AllianceChannelMgr, ACE_Null_Mutex>::instance();
     if (team == HORDE)
-        return &Trinity::Singleton<HordeChannelMgr>::Instance();
+        return ACE_Singleton<HordeChannelMgr, ACE_Null_Mutex>::instance();
 
     return NULL;
 }
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 1997eb76108..c4e872de6b6 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -22,7 +22,7 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include <map>
 #include <string>
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index bed8e3ee23f..53f2341c5af 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -165,8 +165,8 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
 {
     bool first = true;
 
-    ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
-    HashMapHolder<Player>::MapType &m = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder<Player>::GetLock(), true);
+    HashMapHolder<Player>::MapType &m = sObjectAccessor.GetPlayers();
     for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         AccountTypes itr_sec = itr->second->GetSession()->GetSecurity();
diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index a9f1e7d9c15..771339645fe 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -2381,7 +2381,7 @@ bool ChatHandler::HandleWhispersCommand(const char* args)
 //Save all players in the world
 bool ChatHandler::HandleSaveAllCommand(const char* /*args*/)
 {
-    ObjectAccessor::Instance().SaveAllPlayers();
+    sObjectAccessor.SaveAllPlayers();
     SendSysMessage(LANG_PLAYERS_SAVED);
     return true;
 }
@@ -2502,7 +2502,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
 
         PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), GetTrinityString(LANG_OFFLINE), tele->name.c_str());
         Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation,
-            MapManager::Instance().GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
+            sMapMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
     }
 
     return true;
@@ -2768,7 +2768,7 @@ bool ChatHandler::HandleGoXYCommand(const char* args)
     else
         _player->SaveRecallPosition();
 
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);
+    Map const *map = sMapMgr.CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
 
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
@@ -2861,7 +2861,7 @@ bool ChatHandler::HandleGoZoneXYCommand(const char* args)
     // update to parent zone if exist (client map show only zones without parents)
     AreaTableEntry const* zoneEntry = areaEntry->zone ? GetAreaEntryByAreaID(areaEntry->zone) : areaEntry;
 
-    Map const *map = MapManager::Instance().CreateBaseMap(zoneEntry->mapid);
+    Map const *map = sMapMgr.CreateBaseMap(zoneEntry->mapid);
 
     if (map->Instanceable())
     {
@@ -2936,7 +2936,7 @@ bool ChatHandler::HandleGoGridCommand(const char* args)
     else
         _player->SaveRecallPosition();
 
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);
+    Map const *map = sMapMgr.CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
 
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 5d67ec06660..90c7d5ef8ae 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -2844,7 +2844,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
                 // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                 wpCreature2->LoadFromDB(wpCreature2->GetDBTableGUIDLow(), map);
                 map->Add(wpCreature2);
-                //MapManager::Instance().GetMap(npcCreature->GetMapId())->Add(wpCreature2);
+                //sMapMgr.GetMap(npcCreature->GetMapId())->Add(wpCreature2);
             }
 
             WorldDatabase.PExecuteLog("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'",
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 009a4483f83..3ddf9b84365 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -689,7 +689,7 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
 {
     sLog.outString("Re-Loading config settings...");
     sWorld.LoadConfigSettings(true);
-    MapManager::Instance().InitializeVisibilityDistanceInfo();
+    sMapMgr.InitializeVisibilityDistanceInfo();
     SendGlobalGMSysMessage("World config settings reloaded.");
     return true;
 }
@@ -4513,7 +4513,7 @@ bool ChatHandler::HandleReviveCommand(const char *args)
     }
     else
         // will resurrected at login without corpse
-        ObjectAccessor::Instance().ConvertCorpseForPlayer(target_guid);
+        sObjectAccessor.ConvertCorpseForPlayer(target_guid);
 
     return true;
 }
@@ -5533,8 +5533,8 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
 
     CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin);
 
-    ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
-    HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder<Player>::GetLock(), true);
+    HashMapHolder<Player>::MapType const& plist = sObjectAccessor.GetPlayers();
     for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
         itr->second->SetAtLoginFlag(atLogin);
 
@@ -7020,8 +7020,8 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args)
 
 bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
 {
-    PSendSysMessage("instances loaded: %d", MapManager::Instance().GetNumInstances());
-    PSendSysMessage("players in instances: %d", MapManager::Instance().GetNumPlayersInInstances());
+    PSendSysMessage("instances loaded: %d", sMapMgr.GetNumInstances());
+    PSendSysMessage("players in instances: %d", sMapMgr.GetNumPlayersInInstances());
     PSendSysMessage("instance saves: %d", sInstanceSaveManager.GetNumInstanceSaves());
     PSendSysMessage("players bound: %d", sInstanceSaveManager.GetNumBoundPlayersTotal());
     PSendSysMessage("groups bound: %d", sInstanceSaveManager.GetNumBoundGroupsTotal());
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index cb35d35c63f..2e81aad1859 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include "SingletonImp.h"
+
 #include "Player.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
@@ -29,8 +29,6 @@
 #include "InstanceData.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(ConditionMgr);
-
 // Checks if player meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI)
 bool Condition::Meets(Player * player, Unit* targetOverride)
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 2c7c44ecf7f..bb9fc2708fa 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -121,8 +121,10 @@ typedef std::map<uint32, ConditionList > ConditionReferenceMap;//only used for r
 
 class ConditionMgr
 {
+    friend class ACE_Singleton<ConditionMgr, ACE_Null_Mutex>;
+    ConditionMgr();
+    
     public:
-        ConditionMgr();
         ~ConditionMgr();
 
         void LoadConditions(bool isReload = false);
@@ -165,6 +167,6 @@ class ConditionMgr
         std::list<Condition*> m_AllocatedMemory; // some garbage collection :)
 };
 
-#define sConditionMgr Trinity::Singleton<ConditionMgr>::Instance()
+#define sConditionMgr (*ACE_Singleton<ConditionMgr, ACE_Null_Mutex>::instance())
 
 #endif
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index dc5a5b831fd..bc127cb309c 100755
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DBCStores.h"
-#include "SingletonImp.h"
+
 #include "Logging/Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 1a2c9c9767c..6c089a83bc3 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "SingletonImp.h"
+
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Group.h"
@@ -24,8 +24,6 @@
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 
-INSTANTIATE_SINGLETON_1(LFGMgr);
-
 /*********************************************************/
 /***                    LFG QUEUES                     ***/
 /*********************************************************/
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index a3d6fedc695..88d33743fa9 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -20,7 +20,7 @@
 #define _LFGMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Group.h"
 #include "LFG.h"
 
@@ -237,43 +237,44 @@ typedef std::map<uint8, LFGQueue *> LFGQueueMap;
 
 class LFGMgr
 {
-public:
+    friend class ACE_Singleton<LFGMgr, ACE_Null_Mutex>;
     LFGMgr();
-    ~LFGMgr();
+    public:
+       ~LFGMgr();
 
-    void InitLFG();
-    void SendLfgPlayerInfo(Player *plr);
-    void SendLfgPartyInfo(Player *plr);
-    void Join(Player *plr);
-    void Leave(Player *plr, Group *grp = NULL);
-    void UpdateRoleCheck(Group *grp, Player *plr = NULL);
-    void Update(uint32 diff);
+        void InitLFG();
+        void SendLfgPlayerInfo(Player *plr);
+        void SendLfgPartyInfo(Player *plr);
+        void Join(Player *plr);
+        void Leave(Player *plr, Group *grp = NULL);
+        void UpdateRoleCheck(Group *grp, Player *plr = NULL);
+        void Update(uint32 diff);
 
-private:
-    void BuildLfgRoleCheck(WorldPacket &data, LfgRoleCheck *pRoleCheck);
-    void BuildAvailableRandomDungeonList(WorldPacket &data, Player *plr);
-    void BuildRewardBlock(WorldPacket &data, uint32 dungeon, Player *plr);
-    void BuildPlayerLockDungeonBlock(WorldPacket &data, LfgLockStatusSet *lockSet);
-    void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap *lockMap);
-    bool CheckGroupRoles(LfgRolesMap &groles, bool removeLeaderFlag = true);
+    private:
+        void BuildLfgRoleCheck(WorldPacket &data, LfgRoleCheck *pRoleCheck);
+        void BuildAvailableRandomDungeonList(WorldPacket &data, Player *plr);
+        void BuildRewardBlock(WorldPacket &data, uint32 dungeon, Player *plr);
+        void BuildPlayerLockDungeonBlock(WorldPacket &data, LfgLockStatusSet *lockSet);
+        void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap *lockMap);
+        bool CheckGroupRoles(LfgRolesMap &groles, bool removeLeaderFlag = true);
 
-    LfgLockStatusMap* GetPartyLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
-    LfgLockStatusSet* GetPlayerLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
-    LfgDungeonSet* GetRandomDungeons(uint8 level, uint8 expansion);
-    LfgDungeonSet* GetDungeonsByRandom(uint32 randomdungeon);
-    LfgDungeonSet* GetAllDungeons();
-    LfgReward* GetRandomDungeonReward(uint32 dungeon, bool done, uint8 level);
-    uint8 GetDungeonGroupType(uint32 dungeon);
+        LfgLockStatusMap* GetPartyLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
+        LfgLockStatusSet* GetPlayerLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
+        LfgDungeonSet* GetRandomDungeons(uint8 level, uint8 expansion);
+        LfgDungeonSet* GetDungeonsByRandom(uint32 randomdungeon);
+        LfgDungeonSet* GetAllDungeons();
+        LfgReward* GetRandomDungeonReward(uint32 dungeon, bool done, uint8 level);
+        uint8 GetDungeonGroupType(uint32 dungeon);
 
-    LfgRewardList m_RewardList;
-    LfgRewardList m_RewardDoneList;
-    LfgDungeonMap m_DungeonsMap;
+        LfgRewardList m_RewardList;
+        LfgRewardList m_RewardDoneList;
+        LfgDungeonMap m_DungeonsMap;
 
-    LFGQueueMap m_Queues;
-    LfgRoleCheckMap m_RoleChecks;
-    uint32 m_QueueTimer;
-    bool m_update;
+        LFGQueueMap m_Queues;
+        LfgRoleCheckMap m_RoleChecks;
+        uint32 m_QueueTimer;
+        bool m_update;
 };
 
-#define sLFGMgr Trinity::Singleton<LFGMgr>::Instance()
+#define sLFGMgr (*ACE_Singleton<LFGMgr, ACE_Null_Mutex>::instance())
 #endif
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 6d9e11104ab..2811cfa129f 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -54,7 +54,7 @@ void Corpse::AddToWorld()
 {
     ///- Register the corpse for guid lookup
     if (!IsInWorld())
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
 
     Object::AddToWorld();
 }
@@ -63,7 +63,7 @@ void Corpse::RemoveFromWorld()
 {
     ///- Remove the corpse from the accessor
     if (IsInWorld())
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
 
     Object::RemoveFromWorld();
 }
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 62300e43a39..6570a418be9 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -49,7 +49,7 @@
 #include "Vehicle.h"
 #include "SpellAuraEffects.h"
 // apply implementation of the singletons
-#include "SingletonImp.h"
+
 
 TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {
@@ -185,7 +185,7 @@ void Creature::AddToWorld()
     {
         if (m_zoneScript)
             m_zoneScript->OnCreatureCreate(this, true);
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         Unit::AddToWorld();
         SearchFormation();
         AIM_Initialize();
@@ -203,7 +203,7 @@ void Creature::RemoveFromWorld()
         if (m_formation)
             formation_mgr.RemoveCreatureFromGroup(m_formation, this);
         Unit::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
@@ -2410,7 +2410,7 @@ time_t Creature::GetLinkedCreatureRespawnTime() const
             if (data->mapid == GetMapId())   // look up on the same map
                 targetMap = GetMap();
             else                            // it shouldn't be instanceable map here
-                targetMap = MapManager::Instance().FindMap(data->mapid);
+                targetMap = sMapMgr.FindMap(data->mapid);
         }
         if (targetMap)
             return objmgr.GetCreatureRespawnTime(targetGuid,targetMap->GetInstanceId());
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index a7c17561516..ae37ba56fd3 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -700,7 +700,7 @@ class Creature : public Unit, public GridObject<Creature>
 
         bool DisableReputationGain;
 
-        CreatureInfo const* m_creatureInfo;                 // in difficulty mode > 0 can different from ObjMgr::GetCreatureTemplate(GetEntry())
+        CreatureInfo const* m_creatureInfo;                 // in difficulty mode > 0 can different from objmgr.::GetCreatureTemplate(GetEntry())
         CreatureData const* m_creatureData;
 
         uint16 m_LootMode;                                  // bitmask, default LOOT_MODE_DEFAULT, determines what loot will be lootable
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 25aab942916..7bd05123ec5 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -22,13 +22,11 @@
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
+
 #include "CreatureAI.h"
 
 #define MAX_DESYNC 5.0f
 
-INSTANTIATE_SINGLETON_1(CreatureGroupManager);
-
 CreatureGroupInfoType   CreatureGroupMap;
 
 void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
index 521586b7457..4aa49571b5d 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@@ -35,12 +35,15 @@ struct FormationInfo
 
 class CreatureGroupManager
 {
+    friend class ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>;
     public:
         void AddCreatureToGroup(uint32 group_id, Creature *creature);
         void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
         void LoadCreatureFormations();
 };
 
+#define formation_mgr (*ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>::instance())
+
 typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*>   CreatureGroupInfoType;
 
 extern CreatureGroupInfoType    CreatureGroupMap;
@@ -73,6 +76,4 @@ class CreatureGroup
         void MemberAttackStart(Creature* member, Unit *target);
 };
 
-#define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
-
 #endif
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 5c13fe47cb7..529710eda90 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@@ -46,7 +46,7 @@ void DynamicObject::AddToWorld()
     ///- Register the dynamicObject for guid lookup
     if (!IsInWorld())
     {
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         WorldObject::AddToWorld();
     }
 }
@@ -69,7 +69,7 @@ void DynamicObject::RemoveFromWorld()
             }
         }
         WorldObject::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 364bc8ec29c..8783a8b5199 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -117,7 +117,7 @@ void GameObject::AddToWorld()
         if (m_zoneScript)
             m_zoneScript->OnGameObjectCreate(this, true);
 
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         WorldObject::AddToWorld();
     }
 }
@@ -139,7 +139,7 @@ void GameObject::RemoveFromWorld()
                 sLog.outError("Delete GameObject (GUID: %u Entry: %u) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
         }
         WorldObject::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 4e32b48d6b8..fe4b8673b8f 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -110,7 +110,7 @@ Object::~Object()
     {
         sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
         assert(false);
-        ObjectAccessor::Instance().RemoveUpdateObject(this);
+        sObjectAccessor.RemoveUpdateObject(this);
     }
 
     delete [] m_uint32Values;
@@ -731,7 +731,7 @@ void Object::ClearUpdateMask(bool remove)
     if (m_objectUpdated)
     {
         if (remove)
-            ObjectAccessor::Instance().RemoveUpdateObject(this);
+            sObjectAccessor.RemoveUpdateObject(this);
         m_objectUpdated = false;
     }
 }
@@ -804,7 +804,7 @@ void Object::SetInt32Value(uint16 index, int32 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -823,7 +823,7 @@ void Object::SetUInt32Value(uint16 index, uint32 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -849,7 +849,7 @@ void Object::SetUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -868,7 +868,7 @@ bool Object::AddUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -889,7 +889,7 @@ bool Object::RemoveUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -910,7 +910,7 @@ void Object::SetFloatValue(uint16 index, float value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -936,7 +936,7 @@ void Object::SetByteValue(uint16 index, uint8 offset, uint8 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -962,7 +962,7 @@ void Object::SetUInt16Value(uint16 index, uint8 offset, uint16 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1031,7 +1031,7 @@ void Object::SetFlag(uint16 index, uint32 newFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1052,7 +1052,7 @@ void Object::RemoveFlag(uint16 index, uint32 oldFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1077,7 +1077,7 @@ void Object::SetByteFlag(uint16 index, uint8 offset, uint8 newFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1102,7 +1102,7 @@ void Object::RemoveByteFlag(uint16 index, uint8 offset, uint8 oldFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1502,7 +1502,7 @@ void Object::ForceValuesUpdateAtIndex(uint32 i)
     {
         if (!m_objectUpdated)
         {
-            ObjectAccessor::Instance().AddUpdateObject(this);
+            sObjectAccessor.AddUpdateObject(this);
             m_objectUpdated = true;
         }
     }
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index ed4bd4d6f96..3e3eea67cca 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -74,7 +74,7 @@ void Pet::AddToWorld()
     if (!IsInWorld())
     {
         ///- Register the pet for guid lookup
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         Unit::AddToWorld();
         AIM_Initialize();
     }
@@ -98,7 +98,7 @@ void Pet::RemoveFromWorld()
     {
         ///- Don't call the function for Creature, normal mobs + totems go in a different storage
         Unit::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 56d22c7b49e..e3ddcd81f0b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -587,7 +587,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c
         return false;
     }
 
-    SetMap(MapManager::Instance().CreateMap(info->mapId, this, 0));
+    SetMap(sMapMgr.CreateMap(info->mapId, this, 0));
 
     uint8 powertype = cEntry->powerType;
 
@@ -1822,12 +1822,12 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
         // Check enter rights before map getting to avoid creating instance copy for player
         // this check not dependent from map instance copy and same for all instance copies of selected map
-        if (!MapManager::Instance().CanPlayerEnter(mapid, this, false))
+        if (!sMapMgr.CanPlayerEnter(mapid, this, false))
             return false;
 
         // If the map is not created, assume it is possible to enter it.
         // It will be created in the WorldPortAck.
-        Map *map = MapManager::Instance().FindMap(mapid);
+        Map *map = sMapMgr.FindMap(mapid);
         if (!map ||  map->CanEnter(this))
         {
             //lets reset near teleport flag if it wasn't reset during chained teleports
@@ -4255,7 +4255,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
 
     // convert corpse to bones if exist (to prevent exiting Corpse in World without DB entry)
     // bones will be deleted by corpse/bones deleting thread shortly
-    ObjectAccessor::Instance().ConvertCorpseForPlayer(playerguid);
+    sObjectAccessor.ConvertCorpseForPlayer(playerguid);
 
     // remove from guild
     uint32 guildId = GetGuildIdFromDB(playerguid);
@@ -4684,19 +4684,19 @@ void Player::CreateCorpse()
         corpse->SaveToDB();
 
     // register for player, but not show
-    ObjectAccessor::Instance().AddCorpse(corpse);
+    sObjectAccessor.AddCorpse(corpse);
 }
 
 void Player::SpawnCorpseBones()
 {
-    if (ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID()))
+    if (sObjectAccessor.ConvertCorpseForPlayer(GetGUID()))
         if (!GetSession()->PlayerLogoutWithSave())          // at logout we will already store the player
             SaveToDB();                                     // prevent loading as ghost without corpse
 }
 
 Corpse* Player::GetCorpse() const
 {
-    return ObjectAccessor::Instance().GetCorpseForPlayerGUID(GetGUID());
+    return sObjectAccessor.GetCorpseForPlayerGUID(GetGUID());
 }
 
 void Player::DurabilityLossAll(double percent, bool inventory)
@@ -6758,7 +6758,7 @@ uint32 Player::GetZoneIdFromDB(uint64 guid)
         float posy = fields[2].GetFloat();
         float posz = fields[3].GetFloat();
 
-        zone = MapManager::Instance().GetZoneId(map,posx,posy,posz);
+        zone = sMapMgr.GetZoneId(map,posx,posy,posz);
 
         if (zone > 0)
             CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, guidLow);
@@ -8013,7 +8013,7 @@ void Player::RemovedInsignia(Player* looterPlr)
 
     // We have to convert player corpse to bones, not to be able to resurrect there
     // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG
-    Corpse *bones = ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID(),true);
+    Corpse *bones = sObjectAccessor.ConvertCorpseForPlayer(GetGUID(),true);
     if (!bones)
         return;
 
@@ -13680,7 +13680,7 @@ void Player::PrepareQuestMenu(uint64 guid)
     {
         //we should obtain map pointer from GetMap() in 99% of cases. Special case
         //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
         ASSERT(_map);
         GameObject *pGameObject = _map->GetGameObject(guid);
         if (pGameObject)
@@ -13855,7 +13855,7 @@ Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest)
     {
         //we should obtain map pointer from GetMap() in 99% of cases. Special case
         //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
         ASSERT(_map);
         GameObject *pGameObject = _map->GetGameObject(guid);
         if (pGameObject)
@@ -15955,7 +15955,7 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
         }
         else
         {
-            for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+            for (MapManager::TransportSet::iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
             {
                 if ((*iter)->GetGUIDLow() == transGUID)
                 {
@@ -16038,7 +16038,7 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
 
     // NOW player must have valid map
     // load the player's map here if it's not already loaded
-    Map *map = MapManager::Instance().CreateMap(mapId, this, instanceId);
+    Map *map = sMapMgr.CreateMap(mapId, this, instanceId);
 
     if (!map)
     {
@@ -16056,14 +16056,14 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
             RelocateToHomebind();
         }
 
-        map = MapManager::Instance().CreateMap(mapId, this, 0);
+        map = sMapMgr.CreateMap(mapId, this, 0);
         if (!map)
         {
             PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
             mapId = info->mapId;
             Relocate(info->positionX,info->positionY,info->positionZ,0.0f);
             sLog.outError("ERROR: Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
-            map = MapManager::Instance().CreateMap(mapId, this, 0);
+            map = sMapMgr.CreateMap(mapId, this, 0);
             if (!map)
             {
                 sLog.outError("ERROR: Player (guidlow %d) has invalid default map coordinates (X: %f Y: %f Z: %f O: %f). or instance couldn't be created",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
@@ -16532,7 +16532,7 @@ void Player::_LoadGlyphAuras()
 void Player::LoadCorpse()
 {
     if (isAlive())
-        ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID());
+        sObjectAccessor.ConvertCorpseForPlayer(GetGUID());
     else
     {
         if (Corpse *corpse = GetCorpse())
@@ -17446,7 +17446,7 @@ bool Player::CheckInstanceLoginValid()
     }
 
     // do checks for satisfy accessreqs, instance full, encounter in progress (raid), perm bind group != perm bind player
-    return MapManager::Instance().CanPlayerEnter(GetMap()->GetId(), this, true);
+    return sMapMgr.CanPlayerEnter(GetMap()->GetId(), this, true);
 }
 
 bool Player::_LoadHomeBind(QueryResult_AutoPtr result)
@@ -18285,7 +18285,7 @@ void Player::ResetInstances(uint8 method, bool isRaid)
         }
 
         // if the map is loaded, reset it
-        Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
+        Map *map = sMapMgr.FindMap(p->GetMapId(), p->GetInstanceId());
         if (map && map->IsDungeon())
             if (!((InstanceMap*)map)->Reset(method))
             {
diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index a64692895a3..0de95352d19 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "SocialMgr.h"
-#include "SingletonImp.h"
+
 #include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
@@ -28,8 +28,6 @@
 #include "World.h"
 #include "Util.h"
 
-INSTANTIATE_SINGLETON_1(SocialMgr);
-
 PlayerSocial::PlayerSocial()
 {
     m_playerGUID = 0;
diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index 092ab09dc15..dbed6e93006 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -21,7 +21,7 @@
 #ifndef __TRINITY_SOCIALMGR_H
 #define __TRINITY_SOCIALMGR_H
 
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "DatabaseEnv.h"
 #include "Common.h"
 
@@ -139,8 +139,9 @@ class PlayerSocial
 
 class SocialMgr
 {
+    friend class ACE_Singleton<SocialMgr, ACE_Null_Mutex>;
+    SocialMgr();
     public:
-        SocialMgr();
         ~SocialMgr();
         // Misc
         void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); }
@@ -156,6 +157,6 @@ class SocialMgr
         SocialMap m_socialMap;
 };
 
-#define sSocialMgr Trinity::Singleton<SocialMgr>::Instance()
+#define sSocialMgr (*ACE_Singleton<SocialMgr, ACE_Null_Mutex>::instance())
 #endif
 
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index e1577237125..2a82b5c33df 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -106,7 +106,7 @@ void MapManager::LoadTransports()
             m_TransportsByMap[*i].insert(t);
 
         //If we someday decide to use the grid to track transports, here:
-        t->SetMap(MapManager::Instance().CreateMap(mapid, t, 0));
+        t->SetMap(sMapMgr.CreateMap(mapid, t, 0));
 
         //t->GetMap()->Add<GameObject>((GameObject *)t);
         ++count;
@@ -455,7 +455,7 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
     //yes, you're right
 
     ResetMap();
-    Map * newMap = MapManager::Instance().CreateMap(newMapid, this, 0);
+    Map * newMap = sMapMgr.CreateMap(newMapid, this, 0);
     SetMap(newMap);
     assert (GetMap());
 
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 0ee16010393..9d0bce23fd5 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14062,7 +14062,7 @@ void Unit::StopMoving()
 
     // send explicit stop packet
     // rely on vmaps here because for example stormwind is in air
-    //float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
+    //float z = sMapMgr.GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
     //if (fabs(GetPositionZ() - z) < 2.0f)
     //    Relocate(GetPositionX(), GetPositionY(), z);
     //Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 25cd624b3c5..f22db3c8187 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -27,13 +27,10 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "SingletonImp.h"
 #include "GossipDef.h"
 #include "Player.h"
 #include "BattleGroundMgr.h"
 
-INSTANTIATE_SINGLETON_1(GameEventMgr);
-
 bool GameEventMgr::CheckOneGameEvent(uint16 entry) const
 {
     switch(mGameEvent[entry].state)
@@ -1270,7 +1267,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             objmgr.AddCreatureToGrid(*itr, data);
 
             // Spawn if necessary (loaded grids only)
-            Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
+            Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
             // We use spawn coords to spawn
             if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
             {
@@ -1298,7 +1295,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             objmgr.AddGameobjectToGrid(*itr, data);
             // Spawn if necessary (loaded grids only)
             // this base map checked as non-instanced and then only existed
-            Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
+            Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
             // We use current coords to unspawn, not spawn coords since creature can have changed grid
             if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
             {
@@ -1345,7 +1342,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         {
             objmgr.RemoveCreatureFromGrid(*itr, data);
 
-            if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+            if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL))
                 pCreature->AddObjectToRemoveList();
         }
     }
@@ -1366,7 +1363,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         {
             objmgr.RemoveGameobjectFromGrid(*itr, data);
 
-            if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+            if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
                 pGameobject->AddObjectToRemoveList();
         }
     }
@@ -1392,7 +1389,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
             continue;
 
         // Update if spawned
-        Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL);
+        Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL);
         if (pCreature)
         {
             if (activate)
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 21178805859..656be331edc 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -24,7 +24,7 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #define max_ge_check_delay DAY  // 1 day in seconds
 
@@ -92,9 +92,11 @@ class Creature;
 
 class GameEventMgr
 {
+    friend class ACE_Singleton<GameEventMgr, ACE_Null_Mutex>;
+    GameEventMgr();
     public:
-        GameEventMgr();
         ~GameEventMgr() {};
+
         typedef std::set<uint16> ActiveEvents;
         typedef std::vector<GameEventData> GameEventDataMap;
         ActiveEvents const& GetActiveEventList() const { return m_ActiveEvents; }
@@ -172,7 +174,7 @@ class GameEventMgr
         GameEventGuidMap  mGameEventGameobjectGuids;
 };
 
-#define gameeventmgr Trinity::Singleton<GameEventMgr>::Instance()
+#define gameeventmgr (*ACE_Singleton<GameEventMgr, ACE_Null_Mutex>::instance())
 
  bool IsHolidayActive(HolidayIds id);
  bool IsEventActive(uint16 event_id);
diff --git a/src/server/game/Globals/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp
index acdd91248bc..e83441cf3bb 100644
--- a/src/server/game/Globals/GlobalEvents.cpp
+++ b/src/server/game/Globals/GlobalEvents.cpp
@@ -53,7 +53,7 @@ static void CorpsesEraseCallBack(QueryResult_AutoPtr result, bool bones)
         /// Resurrectable - convert corpses to bones
         if (!bones)
         {
-            if (!ObjectAccessor::Instance().ConvertCorpseForPlayer(player_guid))
+            if (!sObjectAccessor.ConvertCorpseForPlayer(player_guid))
             {
                 sLog.outDebug("Corpse %u not found in world or bones creating forbidden. Delete from DB.",guidlow);
                 CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
@@ -62,7 +62,7 @@ static void CorpsesEraseCallBack(QueryResult_AutoPtr result, bool bones)
         else
             ///- or delete bones
         {
-            MapManager::Instance().RemoveBonesFromMap(mapid, guid, positionX, positionY);
+            sMapMgr.RemoveBonesFromMap(mapid, guid, positionX, positionY);
 
             ///- remove bones from the database
             CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 73aca9865f8..b82944d8327 100644
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -20,7 +20,7 @@
 
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "SingletonImp.h"
+
 #include "Player.h"
 #include "Creature.h"
 #include "GameObject.h"
@@ -41,10 +41,6 @@
 
 #include <cmath>
 
-#define CLASS_LOCK Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex>
-INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
-
 ObjectAccessor::ObjectAccessor()
 {
 }
@@ -151,7 +147,7 @@ Player* ObjectAccessor::FindPlayer(uint64 guid)
 
 Player* ObjectAccessor::FindPlayerByName(const char* name)
 {
-    Guard guard(*HashMapHolder<Player>::GetLock());
+    ACE_GUARD_RETURN(LockType, g, *HashMapHolder<Player>::GetLock(), NULL);
     HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer();
     for (HashMapHolder<Player>::MapType::iterator iter = m.begin(); iter != m.end(); ++iter)
         if (iter->second->IsInWorld() && strcmp(name, iter->second->GetName()) == 0)
@@ -162,7 +158,7 @@ Player* ObjectAccessor::FindPlayerByName(const char* name)
 
 void ObjectAccessor::SaveAllPlayers()
 {
-    Guard guard(*HashMapHolder<Player>::GetLock());
+    ACE_GUARD(LockType, g, *HashMapHolder<Player>::GetLock());
     HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer();
     for (HashMapHolder<Player>::MapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         itr->second->SaveToDB();
@@ -175,7 +171,7 @@ Pet* ObjectAccessor::GetPet(uint64 guid)
 
 Corpse* ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid)
 {
-    Guard guard(i_corpseGuard);
+    ACE_GUARD_RETURN(LockType, guard, i_corpseGuard, NULL);
 
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid);
     if (iter == i_player2corpse.end())
@@ -197,7 +193,7 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse)
 
     // Critical section
     {
-        Guard guard(i_corpseGuard);
+        ACE_GUARD(LockType, g, i_corpseGuard);
 
         Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID());
         if (iter == i_player2corpse.end()) // TODO: Fix this
@@ -219,7 +215,7 @@ void ObjectAccessor::AddCorpse(Corpse* corpse)
 
     // Critical section
     {
-        Guard guard(i_corpseGuard);
+        ACE_GUARD(LockType, g, i_corpseGuard);
 
         assert(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end());
         i_player2corpse[corpse->GetOwnerGUID()] = corpse;
@@ -234,7 +230,7 @@ void ObjectAccessor::AddCorpse(Corpse* corpse)
 
 void ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map* map)
 {
-    Guard guard(i_corpseGuard);
+    ACE_GUARD(LockType, g, i_corpseGuard);
 
     for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter)
     {
@@ -274,7 +270,7 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool /*insign
     // done in removecorpse
     // remove resurrectable corpse from grid object registry (loaded state checked into call)
     // do not load the map if it's not loaded
-    //Map *map = MapManager::Instance().FindMap(corpse->GetMapId(), corpse->GetInstanceId());
+    //Map *map = sMapMgr.FindMap(corpse->GetMapId(), corpse->GetInstanceId());
     //if (map)
     //    map->Remove(corpse, false);
 
@@ -333,7 +329,7 @@ void ObjectAccessor::Update(uint32 /*diff*/)
 
     // Critical section
     {
-        Guard guard(i_updateGuard);
+        ACE_GUARD(LockType, g, i_updateGuard);
 
         while (!i_objects.empty())
         {
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index e3295428505..fc128d6a4e0 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -22,10 +22,9 @@
 #define TRINITY_OBJECTACCESSOR_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include <ace/Singleton.h>
 #include <ace/Thread_Mutex.h>
 #include "UnorderedMap.h"
-#include "ThreadingModel.h"
 
 #include "UpdateData.h"
 
@@ -50,23 +49,22 @@ class HashMapHolder
 
         typedef UNORDERED_MAP<uint64, T*> MapType;
         typedef ACE_Thread_Mutex LockType;
-        typedef Trinity::GeneralLock<LockType> Guard;
 
         static void Insert(T* o)
         {
-            Guard guard(i_lock);
+            ACE_GUARD(LockType, Guard, i_lock);
             m_objectMap[o->GetGUID()] = o;
         }
 
         static void Remove(T* o)
         {
-            Guard guard(i_lock);
+            ACE_GUARD(LockType, Guard, i_lock);
             m_objectMap.erase(o->GetGUID());
         }
 
         static T* Find(uint64 guid)
         {
-            Guard guard(i_lock);
+            ACE_GUARD_RETURN(LockType, Guard, i_lock, NULL);
             typename MapType::iterator itr = m_objectMap.find(guid);
             return (itr != m_objectMap.end()) ? itr->second : NULL;
         }
@@ -84,9 +82,9 @@ class HashMapHolder
         static MapType  m_objectMap;
 };
 
-class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
+class ObjectAccessor
 {
-    friend class Trinity::OperatorNew<ObjectAccessor>;
+    friend class ACE_Singleton<ObjectAccessor, ACE_Thread_Mutex>;
     ObjectAccessor();
     ~ObjectAccessor();
     ObjectAccessor(const ObjectAccessor&);
@@ -220,13 +218,13 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
 
         void AddUpdateObject(Object* obj)
         {
-            Guard guard(i_updateGuard);
+            ACE_GUARD(LockType, Guard, i_updateGuard);
             i_objects.insert(obj);
         }
 
         void RemoveUpdateObject(Object* obj)
         {
-            Guard guard(i_updateGuard);
+            ACE_GUARD(LockType, Guard, i_updateGuard);
             i_objects.erase(obj);
         }
 
@@ -239,7 +237,6 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
         Corpse* ConvertCorpseForPlayer(uint64 player_guid, bool insignia = false);
 
         typedef ACE_Thread_Mutex LockType;
-        typedef Trinity::GeneralLock<LockType> Guard;
 
     private:
 
@@ -254,4 +251,6 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
         LockType i_updateGuard;
         LockType i_corpseGuard;
 };
+
+#define sObjectAccessor (*ACE_Singleton<ObjectAccessor, ACE_Thread_Mutex>::instance())
 #endif
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index bab1add0132..00fbc83244c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -22,8 +22,6 @@
 #include "DatabaseEnv.h"
 #include "SQLStorage.h"
 #include "SQLStorageImpl.h"
-#include "SingletonImp.h"
-
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
@@ -48,8 +46,6 @@
 #include "Vehicle.h"
 #include "AchievementMgr.h"
 
-INSTANTIATE_SINGLETON_1(ObjectMgr);
-
 ScriptMapMap sQuestEndScripts;
 ScriptMapMap sQuestStartScripts;
 ScriptMapMap sSpellScripts;
@@ -1412,7 +1408,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
     if (!goinfo)
         return 0;
 
-    Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId));
+    Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(mapId));
     if (!map)
         return 0;
 
@@ -1473,7 +1469,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
     AddCreatureToGrid(guid, &data);
 
     // Spawn if necessary (loaded grids only)
-    if (Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId)))
+    if (Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(mapId)))
     {
         // We use spawn coords to spawn
         if (!map->Instanceable() && map->IsLoaded(data.posX, data.posY))
@@ -1524,7 +1520,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float
     AddCreatureToGrid(guid, &data);
 
     // Spawn if necessary (loaded grids only)
-    if (Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId)))
+    if (Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(mapId)))
     {
         // We use spawn coords to spawn
         if (!map->Instanceable() && !map->IsRemovalGrid(x, y))
@@ -5547,7 +5543,7 @@ void ObjectMgr::LoadGraveyardZones()
 WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
 {
     // search for zone associated closest graveyard
-    uint32 zoneId = MapManager::Instance().GetZoneId(MapId,x,y,z);
+    uint32 zoneId = sMapMgr.GetZoneId(MapId,x,y,z);
 
     // Simulate std. algorithm:
     //   found some graveyard associated to (ghost_zone,ghost_map)
@@ -6608,7 +6604,7 @@ void ObjectMgr::LoadCorpses()
             continue;
         }
 
-        ObjectAccessor::Instance().AddCorpse(corpse);
+        sObjectAccessor.AddCorpse(corpse);
 
         ++count;
     }
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index b1a5bd0e1cd..320bf12cb21 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -37,7 +37,7 @@
 #include "Map.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "SQLStorage.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
@@ -354,11 +354,11 @@ class PlayerDumpReader;
 class ObjectMgr
 {
     friend class PlayerDumpReader;
-
+    friend class ACE_Singleton<ObjectMgr, ACE_Null_Mutex>;
+    ObjectMgr();
+    ~ObjectMgr();
+    
     public:
-        ObjectMgr();
-        ~ObjectMgr();
-
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
         typedef std::set< Group * > GroupSet;
@@ -382,7 +382,7 @@ class ObjectMgr
 
         typedef std::vector<std::string> ScriptNameMap;
 
-        Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
+        Player* GetPlayer(const char* name) const { return sObjectAccessor.FindPlayerByName(name);}
         Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
 
         static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry<GameObjectInfo>(id); }
@@ -1083,7 +1083,7 @@ class ObjectMgr
 
 };
 
-#define objmgr Trinity::Singleton<ObjectMgr>::Instance()
+#define objmgr (*ACE_Singleton<ObjectMgr, ACE_Null_Mutex>::instance())
 
 // scripting access functions
  bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min());
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index fd2cc28c184..2e300ac5e38 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -33,7 +33,6 @@
 */
 
 #include "Define.h"
-#include "ThreadingModel.h"
 #include "TypeContainer.h"
 #include "TypeContainerVisitor.h"
 
@@ -44,8 +43,7 @@ template
 <
 class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
-class GRID_OBJECT_TYPES,
-class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
+class GRID_OBJECT_TYPES
 >
 class Grid
 {
@@ -131,9 +129,6 @@ class Grid
         }*/
     private:
 
-        typedef typename ThreadModel::Lock Guard;
-        typedef typename ThreadModel::VolatileType VolatileType;
-
         TypeMapContainer<GRID_OBJECT_TYPES> i_container;
         TypeMapContainer<WORLD_OBJECT_TYPES> i_objects;
         //typedef std::set<void*> ActiveGridObjects;
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 8c539519211..1411ac71c4a 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -74,14 +74,13 @@ template
 unsigned int N,
 class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
-class GRID_OBJECT_TYPES,
-class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
+class GRID_OBJECT_TYPES
 >
 class NGrid
 {
     public:
 
-        typedef Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> GridType;
+        typedef Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> GridType;
         NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true)
             : i_gridId(id), i_x(x), i_y(y), i_cellstate(GRID_STATE_INVALID), i_GridObjectDataLoaded(false)
         {
@@ -109,7 +108,7 @@ class NGrid
         int32 getX() const { return i_x; }
         int32 getY() const { return i_y; }
 
-        void link(GridRefManager<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> >* pTo)
+        void link(GridRefManager<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> >* pTo)
         {
             i_Reference.link(pTo, this);
         }
@@ -178,7 +177,7 @@ class NGrid
 
         uint32 i_gridId;
         GridInfo i_GridInfo;
-        GridReference<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> > i_Reference;
+        GridReference<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> > i_Reference;
         int32 i_x;
         int32 i_y;
         grid_state_t i_cellstate;
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index ab69d9a966b..f0da10975ac 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -151,7 +151,7 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType
 
         uint32 player_guid = itr->first;
 
-        Corpse *obj = ObjectAccessor::Instance().GetCorpseForPlayerGUID(player_guid);
+        Corpse *obj = sObjectAccessor.GetCorpseForPlayerGUID(player_guid);
         if (!obj)
             continue;
 
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 53fa9a3ecdb..2977515959b 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1724,7 +1724,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
 
         bool isEmpty = true;
         // if the map is loaded, reset it
-        Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
+        Map *map = sMapMgr.FindMap(p->GetMapId(), p->GetInstanceId());
         if (map && map->IsDungeon() && !(method == INSTANCE_RESET_GROUP_DISBAND && !p->CanReset()))
         {
             if (p->CanReset())
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index c62038cfbf0..7b5ccf1c46a 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -21,7 +21,6 @@
 
 #include "Common.h"
 #include "SQLStorage.h"
-
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
@@ -40,14 +39,7 @@
 #include "Group.h"
 #include "InstanceData.h"
 #include "ProgressBar.h"
-#include "Singleton.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(InstanceSaveManager);
 
-InstanceSaveManager::InstanceSaveManager() : lock_instLists(false)
-{
-}
 
 InstanceSaveManager::~InstanceSaveManager()
 {
@@ -173,7 +165,7 @@ void InstanceSave::SaveToDB()
     // save instance data too
     std::string data;
 
-    Map *map = MapManager::Instance().FindMap(GetMapId(),m_instanceid);
+    Map *map = sMapMgr.FindMap(GetMapId(),m_instanceid);
     if (map)
     {
         assert(map->IsDungeon());
@@ -615,7 +607,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr)
 void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId)
 {
     sLog.outDebug("InstanceSaveMgr::_ResetInstance %u, %u", mapid, instanceId);
-    Map *map = (MapInstanced*)MapManager::Instance().CreateBaseMap(mapid);
+    Map *map = (MapInstanced*)sMapMgr.CreateBaseMap(mapid);
     if (!map->Instanceable())
         return;
 
@@ -679,7 +671,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
     }
 
     // note: this isn't fast but it's meant to be executed very rarely
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);          // _not_ include difficulty
+    Map const *map = sMapMgr.CreateBaseMap(mapid);          // _not_ include difficulty
     MapInstanced::InstancedMaps &instMaps = ((MapInstanced*)map)->GetInstancedMaps();
     MapInstanced::InstancedMaps::iterator mitr;
     for (mitr = instMaps.begin(); mitr != instMaps.end(); ++mitr)
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 3d8bfb70ebf..66751cc4f10 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -23,7 +23,7 @@
 #define __InstanceSaveMgr_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include <list>
 #include <map>
@@ -117,13 +117,14 @@ class InstanceSave
 
 typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap;
 
-class InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trinity::ClassLevelLockable<InstanceSaveManager, ACE_Thread_Mutex> >
+class InstanceSaveManager
 {
+    friend class ACE_Singleton<InstanceSaveManager, ACE_Null_Mutex>;
     friend class InstanceSave;
     public:
-        InstanceSaveManager();
+        InstanceSaveManager() : lock_instLists(false) {};        
         ~InstanceSaveManager();
-
+        
         typedef UNORDERED_MAP<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap;
         typedef UNORDERED_MAP<uint32 /*mapId*/, InstanceSaveHashMap> InstanceSaveMapMap;
 
@@ -176,6 +177,7 @@ class InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trini
         uint32 GetNumBoundGroupsTotal();
 
     private:
+        
         void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, uint32 timeleft);
         void _ResetInstance(uint32 mapid, uint32 instanceId);
         void _ResetSave(InstanceSaveHashMap::iterator &itr);
@@ -189,5 +191,5 @@ class InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trini
         ResetTimeQueue m_resetTimeQueue;
 };
 
-#define sInstanceSaveManager Trinity::Singleton<InstanceSaveManager>::Instance()
+#define sInstanceSaveManager (*ACE_Singleton<InstanceSaveManager, ACE_Thread_Mutex>::instance())
 #endif
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index a0656bee38c..960e1e4cef4 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -325,7 +325,7 @@ void Map::DeleteFromWorld(T* obj)
 template<>
 void Map::DeleteFromWorld(Player* pl)
 {
-    ObjectAccessor::Instance().RemoveObject(pl);
+    sObjectAccessor.RemoveObject(pl);
     delete pl;
 }
 
@@ -334,7 +334,7 @@ Map::EnsureGridCreated(const GridPair &p)
 {
     if (!getNGrid(p.x_coord, p.y_coord))
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         if (!getNGrid(p.x_coord, p.y_coord))
         {
             sLog.outDebug("Creating grid[%u,%u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId);
@@ -395,7 +395,7 @@ bool Map::EnsureGridLoaded(const Cell &cell)
         loader.LoadN();
 
         // Add resurrectable corpses to world object list in grid
-        ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
+        sObjectAccessor.AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
 
         setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
         return true;
@@ -828,7 +828,7 @@ bool Map::RemoveBones(uint64 guid, float x, float y)
 {
     if (IsRemovalGrid(x, y))
     {
-        Corpse * corpse = ObjectAccessor::Instance().GetObjectInWorld(GetId(), x, y, guid, (Corpse*)NULL);
+        Corpse * corpse = sObjectAccessor.GetObjectInWorld(GetId(), x, y, guid, (Corpse*)NULL);
         if (corpse && corpse->GetTypeId() == TYPEID_CORPSE && corpse->GetType() == CORPSE_BONES)
             corpse->DeleteBonesFromWorld();
         else
@@ -2069,7 +2069,7 @@ void Map::SendInitSelf(Player * player)
 void Map::SendInitTransports(Player * player)
 {
     // Hack to send out transports
-    MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
+    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
 
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
@@ -2096,7 +2096,7 @@ void Map::SendInitTransports(Player * player)
 void Map::SendRemoveTransports(Player * player)
 {
     // Hack to send out transports
-    MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
+    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
 
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
@@ -2196,7 +2196,7 @@ void Map::RemoveAllObjectsInRemoveList()
         {
             case TYPEID_CORPSE:
             {
-                Corpse* corpse = ObjectAccessor::Instance().GetCorpse(*obj, obj->GetGUID());
+                Corpse* corpse = sObjectAccessor.GetCorpse(*obj, obj->GetGUID());
                 if (!corpse)
                     sLog.outError("Tried to delete corpse/bones %u that is not in map.", obj->GetGUIDLow());
                 else
@@ -2408,7 +2408,7 @@ bool InstanceMap::Add(Player *player)
     // Is it needed?
 
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false);
         // Check moved to void WorldSession::HandleMoveWorldportAckOpcode()
         //if (!CanEnter(player))
             //return false;
@@ -2733,7 +2733,7 @@ bool BattleGroundMap::CanEnter(Player * player)
 bool BattleGroundMap::Add(Player * player)
 {
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false);
         //Check moved to void WorldSession::HandleMoveWorldportAckOpcode()
         //if (!CanEnter(player))
             //return false;
@@ -2877,7 +2877,7 @@ void Map::ScriptsProcess()
                     source = HashMapHolder<Corpse>::Find(step.sourceGUID);
                     break;
                 case HIGHGUID_MO_TRANSPORT:
-                    for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+                    for (MapManager::TransportSet::iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
                     {
                         if ((*iter)->GetGUID() == step.sourceGUID)
                         {
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index d17dc10ec07..4d25381fbe1 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -22,7 +22,6 @@
 #define TRINITY_MAP_H
 
 #include "Define.h"
-#include "ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
 
@@ -239,7 +238,7 @@ typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList;
 
 typedef std::map<uint32/*leaderDBGUID*/, CreatureGroup*>        CreatureGroupHolderType;
 
-class Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockable<Map, ACE_Thread_Mutex>
+class Map : public GridRefManager<NGridType>
 {
     friend class MapReference;
     public:
@@ -490,7 +489,7 @@ class Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockabl
     protected:
         void SetUnloadReferenceLock(const GridPair &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadReferenceLock(on); }
 
-        typedef Trinity::ObjectLevelLockable<Map, ACE_Thread_Mutex>::Lock Guard;
+        ACE_Thread_Mutex Lock;
 
         MapEntry const* i_mapEntry;
         uint8 i_spawnMode;
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index 0736bfa6fb3..008baeb79d9 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -170,7 +170,7 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
         {
             // if no instanceId via group members or instance saves is found
             // the instance will be created for the first time
-            NewInstanceId = MapManager::Instance().GenerateInstanceId();
+            NewInstanceId = sMapMgr.GenerateInstanceId();
 
             Difficulty diff = player->GetGroup() ? player->GetGroup()->GetDifficulty(IsRaid()) : player->GetDifficulty(IsRaid());
             map = CreateInstance(NewInstanceId, NULL, diff);
@@ -183,7 +183,7 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
 InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save, Difficulty difficulty)
 {
     // load/create a map
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     // make sure we have a valid map id
     const MapEntry* entry = sMapStore.LookupEntry(GetId());
@@ -219,7 +219,7 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
 BattleGroundMap* MapInstanced::CreateBattleGround(uint32 InstanceId, BattleGround* bg)
 {
     // load/create a map
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     sLog.outDebug("MapInstanced::CreateBattleGround: map bg %d for %d created.", InstanceId, GetId());
 
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 42233db4a9a..46b604388c5 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -20,7 +20,6 @@
 
 #include "MapManager.h"
 #include "InstanceSaveMgr.h"
-#include "SingletonImp.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
@@ -37,10 +36,6 @@
 #include "Language.h"
 #include "WorldPacket.h"
 
-#define CLASS_LOCK Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex>
-INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Thread_Mutex);
-
 extern GridState* si_GridStates[];                          // debugging code, should be deleted some day
 
 MapManager::MapManager()
@@ -116,7 +111,7 @@ Map* MapManager::_createBaseMap(uint32 id)
 
     if (m == NULL)
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
         const MapEntry* entry = sMapStore.LookupEntry(id);
         if (entry && entry->Instanceable())
@@ -236,7 +231,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
         InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(player);
         if (boundedInstance && boundedInstance->save)
         {
-            if (Map *boundedMap = MapManager::Instance().FindMap(mapid,boundedInstance->save->GetInstanceId()))
+            if (Map *boundedMap = sMapMgr.FindMap(mapid,boundedInstance->save->GetInstanceId()))
             {
                 // Player permanently bounded to different instance than groups one
                 InstancePlayerBind* playerBoundedInstance = player->GetBoundInstance(mapid, player->GetDungeonDifficulty());
@@ -307,7 +302,7 @@ void MapManager::Update(uint32 diff)
     for (iter = i_maps.begin(); iter != i_maps.end(); ++iter)
         iter->second->DelayedUpdate(i_timer.GetCurrent());
 
-    ObjectAccessor::Instance().Update(i_timer.GetCurrent());
+    sObjectAccessor.Update(i_timer.GetCurrent());
     for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
         (*iter)->Update(i_timer.GetCurrent());
 
@@ -361,7 +356,7 @@ void MapManager::InitMaxInstanceId()
 
 uint32 MapManager::GetNumInstances()
 {
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     uint32 ret = 0;
     for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
@@ -378,7 +373,7 @@ uint32 MapManager::GetNumInstances()
 
 uint32 MapManager::GetNumPlayersInInstances()
 {
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     uint32 ret = 0;
     for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index c3380811c18..47cb9d2f795 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -22,7 +22,7 @@
 #define TRINITY_MAPMANAGER_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
@@ -31,10 +31,9 @@
 
 class Transport;
 
-class MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex> >
+class MapManager
 {
-
-    friend class Trinity::OperatorNew<MapManager>;
+    friend class ACE_Singleton<MapManager, ACE_Thread_Mutex>;
     typedef UNORDERED_MAP<uint32, Map*> MapMapType;
     typedef std::pair<UNORDERED_MAP<uint32, Map*>::iterator, bool>  MapMapPair;
 
@@ -162,7 +161,7 @@ class MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLock
             return (iter == i_maps.end() ? NULL : iter->second);
         }
 
-        typedef Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard;
+        ACE_Thread_Mutex Lock;
         uint32 i_gridCleanUpDelay;
         MapMapType i_maps;
         IntervalTimer i_timer;
@@ -170,4 +169,5 @@ class MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLock
         uint32 i_MaxInstanceId;
         MapUpdater m_updater;
 };
+#define sMapMgr (*ACE_Singleton<MapManager, ACE_Thread_Mutex>::instance())
 #endif
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index 650b4fc3196..9699f6951c2 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -22,7 +22,7 @@
 #define TRINITY_MOVEMENTGENERATOR_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ObjectRegistry.h"
 #include "FactoryHolder.h"
 #include "Common.h"
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 4cadfe1cfb6..416b775ef7e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -343,7 +343,7 @@ void FlightPathMovementGenerator::InitEndGridInfo()
 void FlightPathMovementGenerator::PreloadEndGrid()
 {
     // used to preload the final grid where the flightmaster is
-    Map *endMap = MapManager::Instance().FindMap(m_endMapId);
+    Map *endMap = sMapMgr.FindMap(m_endMapId);
 
     // Load the grid
     if (endMap)
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index 71659a20be7..b19dc01ccd9 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -165,7 +165,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
     // explicit removal from map
     // beats me why this is needed, but with the recent removal "cleanup" some creatures stay in the map if "properly" deleted
     // so this is a big fat workaround, if AddObjectToRemoveList and DoDelayedMovesAndRemoves worked correctly, this wouldn't be needed
-    //if (Map * map = MapManager::Instance().FindMap(cr->GetMapId()))
+    //if (Map * map = sMapMgr.FindMap(cr->GetMapId()))
     //    map->Remove(cr,false);
     // delete respawn time for this creature
     WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE guid = '%u'", guid);
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index f9dbedb30dc..1ec2bcb6a9c 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -25,9 +25,6 @@
 #include "OutdoorPvPEP.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);
 
 OutdoorPvPMgr::OutdoorPvPMgr()
 {
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index a78583100ec..2a18a602da9 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -22,7 +22,7 @@
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
 
 #include "OutdoorPvP.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 class Player;
 class GameObject;
@@ -79,7 +79,7 @@ private:
     uint32 m_UpdateTimer;
 };
 
-#define sOutdoorPvPMgr Trinity::Singleton<OutdoorPvPMgr>::Instance()
+#define sOutdoorPvPMgr (*ACE_Singleton<OutdoorPvPMgr, ACE_Null_Mutex>::instance())
 
 #endif /*OUTDOOR_PVP_MGR_H_*/
 
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index 731d71c6b19..4a7c99216bd 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -21,9 +21,6 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(PoolHandler);
 
 ////////////////////////////////////////////////////////////
 // template class SpawnedPoolData
@@ -201,7 +198,7 @@ void PoolGroup<Creature>::Despawn1Object(uint32 guid)
     {
         objmgr.RemoveCreatureFromGrid(guid, data);
 
-        if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
             pCreature->AddObjectToRemoveList();
     }
 }
@@ -214,7 +211,7 @@ void PoolGroup<GameObject>::Despawn1Object(uint32 guid)
     {
         objmgr.RemoveGameobjectFromGrid(guid, data);
 
-        if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
             pGameobject->AddObjectToRemoveList();
     }
 }
@@ -297,7 +294,7 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj)
         objmgr.AddCreatureToGrid(obj->guid, data);
 
         // Spawn if necessary (loaded grids only)
-        Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
+        Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
         // We use spawn coords to spawn
         if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
         {
@@ -323,7 +320,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj)
         objmgr.AddGameobjectToGrid(obj->guid, data);
         // Spawn if necessary (loaded grids only)
         // this base map checked as non-instanced and then only existed
-        Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
+        Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
         // We use current coords to unspawn, not spawn coords since creature can have changed grid
         if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
         {
@@ -355,7 +352,7 @@ template <>
 void PoolGroup<Creature>::ReSpawn1Object(PoolObject* obj)
 {
     if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
-        if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
             pCreature->GetMap()->Add(pCreature);
 }
 
@@ -364,7 +361,7 @@ template <>
 void PoolGroup<GameObject>::ReSpawn1Object(PoolObject* obj)
 {
     if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
-        if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
             pGameobject->GetMap()->Add(pGameobject);
 }
 
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
index df62badd9c8..156bc47a2a9 100644
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -20,7 +20,7 @@
 #define TRINITY_POOLHANDLER_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
 
@@ -89,10 +89,11 @@ class PoolGroup
 
 class PoolHandler
 {
-    public:
-        PoolHandler();
-        ~PoolHandler() {};
+    friend class ACE_Singleton<PoolHandler, ACE_Null_Mutex>;
+    PoolHandler();
+    ~PoolHandler() {};
 
+    public:
         void LoadFromDB();
         void Initialize();
 
@@ -134,7 +135,7 @@ class PoolHandler
         SpawnedPoolData mSpawnedData;
 };
 
-#define poolhandler Trinity::Singleton<PoolHandler>::Instance()
+#define poolhandler (*ACE_Singleton<PoolHandler, ACE_Null_Mutex>::instance())
 
 // Method that tell if the creature is part of a pool and return the pool id if yes
 template<>
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 88e5b7284c0..70b1ff6be64 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -10,9 +10,6 @@
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(ScriptMgr);
 
 int num_sc_scripts;
 Script *m_scripts[MAX_SCRIPTS];
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 250bbf5526a..bcb26381809 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -94,8 +94,9 @@ struct Script
 
 class ScriptMgr
 {
+    friend class ACE_Singleton<ScriptMgr, ACE_Null_Mutex>;
+    ScriptMgr();
     public:
-        ScriptMgr();
         ~ScriptMgr();
 
         void ScriptsInit();
@@ -158,6 +159,6 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL);
 #define FUNC_PTR(name, callconvention, returntype, parameters)    typedef returntype(callconvention *name)parameters;
 #endif
 
-#define sScriptMgr Trinity::Singleton<ScriptMgr>::Instance()
+#define sScriptMgr (*ACE_Singleton<ScriptMgr, ACE_Null_Mutex>::instance())
 #endif
 
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
index b54c119270f..13fbd266ea4 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
@@ -19,16 +19,11 @@
  */
 
 #include "zlib.h"
-
 #include "AddonHandler.h"
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
 #include "Opcodes.h"
-
 #include "Log.h"
 
-INSTANTIATE_SINGLETON_1( AddonHandler );
-
 AddonHandler::AddonHandler()
 {
 }
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
index 2c9394c947d..68620751da3 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
@@ -23,19 +23,20 @@
 
 #include "Common.h"
 #include "ConfigEnv.h"
-#include "Singleton.h"
-
+#include "ace/Singleton.h"
 #include "WorldPacket.h"
 
 class AddonHandler
 {
+    /* Construction */
+    friend class ACE_Singleton<AddonHandler, ACE_Null_Mutex>;
+    AddonHandler();
+    
     public:
-        /* Construction */
-        AddonHandler();
         ~AddonHandler();
-                                                            //built addon packet
+                                                            //build addon packet
         bool BuildAddonPacket(WorldPacket* Source, WorldPacket* Target);
 };
-#define sAddOnHandler Trinity::Singleton<AddonHandler>::Instance()
+#define sAddOnHandler ACE_Singleton<AddonHandler, ACE_Null_Mutex>::instance()
 #endif
 
diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
index 1d93090d255..3c26e17bddd 100644
--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -91,7 +91,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
         if (!normalizePlayerName(Invitedname))
             return;
 
-        player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
+        player = sObjectAccessor.FindPlayerByName(Invitedname.c_str());
     }
 
     if (!player)
diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
index 73f01f46c4c..442fe55b194 100644
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "SingletonImp.h"
-
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
 
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index 141f3605ee2..ca08d197c3f 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -719,7 +719,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             pCurrChar->TeleportTo(pCurrChar->m_homebindMapId, pCurrChar->m_homebindX, pCurrChar->m_homebindY, pCurrChar->m_homebindZ, pCurrChar->GetOrientation());
     }
 
-    ObjectAccessor::Instance().AddObject(pCurrChar);
+    sObjectAccessor.AddObject(pCurrChar);
     //sLog.outDebug("Player %s added to Map.",pCurrChar->GetName());
 
     pCurrChar->SendInitialPacketsAfterAddToMap();
diff --git a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
index 6803fe63a86..4db1961e7af 100644
--- a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
@@ -75,7 +75,7 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
     recvPacket >> Invitedname;
 
     if (normalizePlayerName(Invitedname))
-        player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
+        player = sObjectAccessor.FindPlayerByName(Invitedname.c_str());
 
     if (!player)
     {
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index e4d329e6afc..3bc5e8d507f 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -232,8 +232,8 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data)
     data << uint32(clientcount);                            // clientcount place holder, listed count
     data << uint32(clientcount);                            // clientcount place holder, online count
 
-    ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
-    HashMapHolder<Player>::MapType& m = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD(ACE_Thread_Mutex, g, *HashMapHolder<Player>::GetLock());
+    HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers();
     for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (security == SEC_PLAYER)
@@ -935,7 +935,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
         return;
 
     // check if player can enter instance : instance not full, and raid instance not in encounter fight
-    if (!MapManager::Instance().CanPlayerEnter(at->target_mapId, GetPlayer(), false))
+    if (!sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))
         return;
 
     GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT);
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 1b850434726..56a8c9cd6da 100644
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -75,7 +75,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     }
 
     // relocate the player to the teleport destination
-    Map * newMap = MapManager::Instance().CreateMap(loc.GetMapId(), GetPlayer(), 0);
+    Map * newMap = sMapMgr.CreateMap(loc.GetMapId(), GetPlayer(), 0);
     // the CanEnter checks are done in TeleporTo but conditions may change
     // while the player is in transit, for example the map may get full
     if (!newMap || !newMap->CanEnter(GetPlayer()))
@@ -302,7 +302,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
         if (plMover && !plMover->GetTransport())
         {
             // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
-            for (MapManager::TransportSet::const_iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+            for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
             {
                 if ((*iter)->GetGUID() == movementInfo.t_guid)
                 {
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 05cbcf81f2f..fc2c3baf735 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -302,7 +302,7 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
             if (corpseMapEntry->IsDungeon() && corpseMapEntry->entrance_map >= 0)
             {
                 // if corpse map have entrance
-                if (Map const* entranceMap = MapManager::Instance().CreateBaseMap(corpseMapEntry->entrance_map))
+                if (Map const* entranceMap = sMapMgr.CreateBaseMap(corpseMapEntry->entrance_map))
                 {
                     mapid = corpseMapEntry->entrance_map;
                     x = corpseMapEntry->entrance_x;
diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp
index a9000f8e65c..e66bff0b504 100644
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ b/src/server/game/Server/Protocol/WorldLog.cpp
@@ -23,14 +23,9 @@
 */
 
 #include "WorldLog.h"
-#include "SingletonImp.h"
 #include "ConfigEnv.h"
 #include "Log.h"
 
-#define CLASS_LOCK Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>
-INSTANTIATE_SINGLETON_2(WorldLog, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(WorldLog, ACE_Thread_Mutex);
-
 WorldLog::WorldLog() : i_file(NULL)
 {
     Initialize();
@@ -67,7 +62,7 @@ void WorldLog::outTimestampLog(char const *fmt, ...)
 {
     if (LogWorld())
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         ASSERT(i_file);
 
         Log::outTimestamp(i_file);
@@ -95,7 +90,7 @@ void WorldLog::outLog(char const *fmt, ...)
 {
     if (LogWorld())
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         ASSERT(i_file);
 
         va_list args;
@@ -117,6 +112,3 @@ void WorldLog::outLog(char const *fmt, ...)
         va_end(ap2);
     }
 }
-
-#define sWorldLog WorldLog::Instance()
-
diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h
index 8a3c96b3b15..fd228ce4559 100644
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/WorldLog.h
@@ -26,19 +26,19 @@
 #define TRINITY_WORLDLOG_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Errors.h"
 
 #include <stdarg.h>
 
 /// %Log packets to a file
-class WorldLog : public Trinity::Singleton<WorldLog, Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex> >
+class WorldLog
 {
-    friend class Trinity::OperatorNew<WorldLog>;
+    friend class ACE_Singleton<WorldLog, ACE_Thread_Mutex>;
     WorldLog();
     WorldLog(const WorldLog &);
     WorldLog& operator=(const WorldLog &);
-    typedef Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>::Lock Guard;
+    ACE_Thread_Mutex Lock;
 
     /// Close the file in destructor
     ~WorldLog();
@@ -57,7 +57,7 @@ class WorldLog : public Trinity::Singleton<WorldLog, Trinity::ClassLevelLockable
         bool m_dbWorld;
 };
 
-#define sWorldLog WorldLog::Instance()
+#define sWorldLog (*ACE_Singleton<WorldLog, ACE_Thread_Mutex>::instance())
 #endif
 /// @}
 
diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index f0bfb5bc0ba..fb34cff150c 100644
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -21,7 +21,6 @@
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 7a975f021ff..a62e602fe49 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -41,7 +41,6 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "SingletonImp.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f89a0650729..19702f1b8f7 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1164,7 +1164,7 @@ void SpellMgr::LoadSpellTargetPositions()
                 // additional requirements
                 if (spellInfo->Effect[i]==SPELL_EFFECT_BIND && spellInfo->EffectMiscValue[i])
                 {
-                    uint32 area_id = MapManager::Instance().GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z);
+                    uint32 area_id = sMapMgr.GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z);
                     if (area_id != uint32(spellInfo->EffectMiscValue[i]))
                     {
                         sLog.outErrorDb("Spell (Id: %u) listed in `spell_target_position` expected point to zone %u bit point to zone %u.",Spell_ID, spellInfo->EffectMiscValue[i], area_id);
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2b6f84fbc1e..7d0b91e38de 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -48,7 +48,6 @@
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
 #include "CreatureAIRegistry.h"
-#include "SingletonImp.h"
 #include "BattleGroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "TemporarySummon.h"
@@ -72,8 +71,6 @@
 #include "LFGMgr.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(World);
-
 volatile bool World::m_stopEvent = false;
 uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
 volatile uint32 World::m_worldLoopCounter = 0;
@@ -635,7 +632,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_INTERVAL_GRIDCLEAN] = MIN_GRID_DELAY;
     }
     if (reload)
-        MapManager::Instance().SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
+        sMapMgr.SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
 
     m_configs[CONFIG_INTERVAL_MAPUPDATE] = sConfig.GetIntDefault("MapUpdateInterval", 100);
     if (m_configs[CONFIG_INTERVAL_MAPUPDATE] < MIN_MAP_UPDATE_DELAY)
@@ -644,7 +641,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_INTERVAL_MAPUPDATE] = MIN_MAP_UPDATE_DELAY;
     }
     if (reload)
-        MapManager::Instance().SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
+        sMapMgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
 
     m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
 
@@ -1666,7 +1663,7 @@ void World::SetInitialWorldSettings()
 
     ///- Initialize MapManager
     sLog.outString("Starting Map System");
-    MapManager::Instance().Initialize();
+    sMapMgr.Initialize();
 
     sLog.outString("Starting Game Event system...");
     uint32 nextGameEvent = gameeventmgr.Initialize();
@@ -1693,7 +1690,7 @@ void World::SetInitialWorldSettings()
 
     //Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
     sLog.outString("Loading Transports...");
-    MapManager::Instance().LoadTransports();
+    sMapMgr.LoadTransports();
 
     sLog.outString("Deleting expired bans...");
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate");
@@ -1945,12 +1942,12 @@ void World::Update(uint32 diff)
 
     /// <li> Handle all other objects
     ///- Update objects when the timer has passed (maps, transport, creatures,...)
-    MapManager::Instance().Update(diff);                // As interval = 0
+    sMapMgr.Update(diff);                // As interval = 0
 
     /*if (m_timers[WUPDATE_OBJECTS].Passed())
     {
         m_timers[WUPDATE_OBJECTS].Reset();
-        MapManager::Instance().DoDelayedMovesAndRemoves();
+        sMapMgr.DoDelayedMovesAndRemoves();
     }*/
 
     static uint32 autobroadcaston = 0;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index c53cab1124f..7266cf7e770 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -27,7 +27,7 @@
 
 #include "Common.h"
 #include "Timer.h"
-#include "Singleton.h"
+#include <ace/Singleton.h>
 #include "SharedDefines.h"
 #include "ace/Atomic_Op.h"
 #include "QueryResult.h"
@@ -779,6 +779,6 @@ class World
 
 extern uint32 realmID;
 
-#define sWorld Trinity::Singleton<World>::Instance()
+#define sWorld (*ACE_Singleton<World, ACE_Null_Mutex>::instance())
 #endif
 /// @}
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index b079dd94a58..f611c21e2bf 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -189,9 +189,9 @@ struct boss_victor_nefariusAI : public ScriptedAI
 
         //Trinity::Singleton<MapManager>::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
         /*
-        list <Player*>::const_iterator i = MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
+        list <Player*>::const_iterator i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin();
 
-        for (i = MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
+        for (i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
         {
         AttackStart((*i));
         }
@@ -288,7 +288,7 @@ struct boss_victor_nefariusAI : public ScriptedAI
                 if (SpawnedAdds >= 42)
                 {
                     //Teleport Victor Nefarius way out of the map
-                    //MapManager::Instance().GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
+                    //sMapMgr.GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
 
                     //Inturrupt any spell casting
                     me->InterruptNonMeleeSpells(false);
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 04fbfbea60f..0fd58e63588 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -12,7 +12,6 @@
 
 set(shared_STAT_SRCS
   Logging/Log.cpp
-  Policies/ObjectLifeTime.cpp
   Threading/DelayExecutor.cpp
   Threading/Threading.cpp
   Utilities/ProgressBar.cpp
@@ -37,7 +36,6 @@ include_directories(
   ${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
   ${MYSQL_INCLUDE_DIR}
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 39830104a7c..3979cbc36aa 100644
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -19,9 +19,6 @@
  */
 
 #include "ConfigEnv.h"
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(Config);
 
 Config::Config() : mIgnoreCase(true), mConf(NULL)
 {
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index bfcb324ee62..50cd4609b25 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -21,15 +21,16 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <Policies/Singleton.h>
+#include <ace/Singleton.h>
 #include "Define.h"
 
 class DOTCONFDocument;
 
 class Config
 {
+    friend class ACE_Singleton<Config, ACE_Null_Mutex>;
+    Config();
     public:
-        Config();
         ~Config();
 
         bool SetSource(const char *file, bool ignorecase = true);
@@ -47,7 +48,7 @@ class Config
         DOTCONFDocument *mConf;
 };
 
-#define sConfig Trinity::Singleton<Config>::Instance()
+#define sConfig (*ACE_Singleton<Config, ACE_Null_Mutex>::instance())
 
 #endif
 
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 2dd2f9bbda4..1fb2f831a9f 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -25,7 +25,6 @@
 #include "Updates/UpdateFields.h"
 
 #include "Utilities/Util.h"
-#include "Policies/SingletonImp.h"
 #include "Define.h"
 #include "Threading/Threading.h"
 #include "Database/SqlDelayThread.h"
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 655479c85fe..762abfd2ede 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -24,7 +24,6 @@
 #include "Threading/Threading.h"
 #include "Dynamic/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
-#include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
diff --git a/src/server/shared/Debugging/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp
index ef7e36c3b57..c591dabb866 100644
--- a/src/server/shared/Debugging/MemoryLeaks.cpp
+++ b/src/server/shared/Debugging/MemoryLeaks.cpp
@@ -17,9 +17,6 @@
  */
 
 #include "MemoryLeaks.h"
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1( MemoryManager ) ;
 
 MemoryManager::MemoryManager( )
 {
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
index bc722f241bd..4b13e4d3d90 100644
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ b/src/server/shared/Debugging/MemoryLeaks.h
@@ -39,10 +39,11 @@
 #endif
 
 
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
-struct MemoryManager : public Trinity::Singleton < MemoryManager >
+struct MemoryManager
 {
     MemoryManager();
 };
+#define sMemoryManager ACE_Singleton<MemoryManager, ACE_Null_Mutex>::instance()
 #endif
diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h
deleted file mode 100644
index bdc06a572c9..00000000000
--- a/src/server/shared/Dynamic/CountedReference/Reference.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef  TRINITY_REFERENCE_H
-#define  TRINITY_REFERENCE_H
-
-/**
- * Referencer<T>
- * Referencer is an object that holds a reference holder that  hold a reference
- * counted object.  When an object's reference count drop to zero, it removes
- * the object.  This is a non intrusive mechanism and any object at any point
- * in time can be referenced.  When and object is reference counted, do not
- * pass the object directly to other methods but rather, pass its
- * reference around.  Objects can be reference counted in both single threaded
- * model and multi-threaded model
- */
-
-#include <stdexcept>
-#include "Define.h"
-#include "ThreadingModel.h"
-#include "ReferenceHolder.h"
-
-template
-<
-typename T,
-class THREADING_MODEL = Trinity::SingleThreaded<T>
->
-class Referencer
-{
-    typedef typename THREADING_MODEL::Lock Lock;
-    typedef ReferenceHolder<T, THREADING_MODEL> ReferenceeHolder;
-    public:
-
-        /// Constructs a referencer.
-        Referencer(T *ref = NULL);
-
-        /// Copy constructor
-        Referencer(const Referencer &obj) : i_holder(NULL) { *this = obj; }
-
-        /// Destructor
-        ~Referencer();
-
-        /// Referencee accessor
-        T* referencee(void) { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        const T* referencee(void) const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        //T& referencee(void){ return _referencee(); }
-        //const T& referencee(void) const { return const_cast<Referencer *>(this)->_referencee(); }
-        operator T&(void) { return _referencee(); }
-        operator const T&(void) const { return *const_cast<Referencer *>(this)->_referencee(); }
-
-        /// cast operators
-        T* operator*() { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        T const * operator*() const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        /// overload operators
-        T* operator->() { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        const T * operator->() const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        /// operator =
-        Referencer& operator=(const Referencer &obj);
-        Referencer& operator=(T *);
-
-        /// returns true if i_referencee is null
-        bool isNull(void) const { return i_holder == NULL; }
-
-    private:
-
-        T& _referencee(void)
-        {
-            if( i_holder == NULL )
-                throw std::runtime_error("Invalid access to null pointer");
-            return *i_holder->i_referencee;
-        }
-
-        void deReference(ReferenceeHolder *);
-        void addReference(ReferenceeHolder *);
-
-        // private data
-        ReferenceeHolder *i_holder;
-};
-#endif
-
diff --git a/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h b/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
deleted file mode 100644
index 597e9854be0..00000000000
--- a/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_REFERENCEHOLDER_H
-#define TRINITY_REFERENCEHOLDER_H
-
-/** ReferenceHolder holds the actualy referenced obejct as well the refence
-    count.  The ReferenecHolder implements as a policy base object and
-    will decided by the Reference class to be consnsitent.
- */
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-struct ReferenceHolder : public THREADING_MODEL
-{
-    explicit ReferenceHolder(T *ref) : i_referencee(ref), i_referenceCount(0) {}
-    T *i_referencee;
-    unsigned int i_referenceCount;
-    typedef typename THREADING_MODEL::Lock Lock;
-};
-#endif
-
diff --git a/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h b/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
deleted file mode 100644
index cde330179e3..00000000000
--- a/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_REFERENCEIMPL_H
-#define TRINITY_REFERENCEIMPL_H
-
-#include "Reference.h"
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer<T, THREADING_MODEL>::Referencer(T *ref)
-: i_holder(NULL)
-{
-    if( ref != NULL )
-    {
-        i_holder = new ReferenceeHolder(ref);
-        ++i_holder->i_referenceCount;
-    }
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer<T, THREADING_MODEL>::~Referencer()
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    i_holder = NULL;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer<T, THREADING_MODEL>&
-Referencer<T, THREADING_MODEL>::operator=(const Referencer<T, THREADING_MODEL> &obj)
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    if( obj.i_holder != NULL )
-        addReference(obj.i_holder);
-    i_holder = obj.i_holder;
-    return *this;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer<T, THREADING_MODEL>&
-Referencer<T, THREADING_MODEL>::operator=(T *ref)
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    i_holder = NULL;
-    if( ref != NULL )
-    {
-        i_holder = new ReferenceeHolder(ref);
-        ++i_holder->i_referenceCount;
-    }
-
-    return *this;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-void
-Referencer<T, THREADING_MODEL>::deReference(ReferenceHolder<T, THREADING_MODEL> *holder)
-{
-    assert( holder != NULL && holder->i_referenceCount > 0);
-    bool delete_object = false;
-
-    {
-        // The guard is within the scope due to the guard
-        // must release earlier than expected.
-        Lock guard(*holder);
-        Guard(&guard);
-
-        --holder->i_referenceCount;
-        if( holder->i_referenceCount == 0 )
-            delete_object = true;
-    }
-
-    if( delete_object )
-    {
-        delete holder->i_referencee;
-        delete holder;
-    }
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-void
-Referencer<T, THREADING_MODEL>::addReference(ReferenceHolder<T, THREADING_MODEL> *holder)
-{
-    assert( i_holder != NULL );
-    Lock guard(*holder);
-    Guard(&guard);
-
-    ++holder->i_referenceCount;
-}
-#endif
-
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index fd5925f5f75..096bdad1783 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -24,7 +24,6 @@
 #include "Define.h"
 #include "Dynamic/TypeList.h"
 #include "ObjectRegistry.h"
-#include "Policies/SingletonImp.h"
 
 /** FactoryHolder holds a factory object of a specific type
  */
@@ -33,14 +32,15 @@ class FactoryHolder
 {
     public:
         typedef ObjectRegistry<FactoryHolder<T, Key >, Key > FactoryHolderRegistry;
-        typedef Trinity::Singleton<FactoryHolderRegistry > FactoryHolderRepository;
+        friend class ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex>;
+        typedef ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex> FactoryHolderRepository;
 
         FactoryHolder(Key k) : i_key(k) {}
         virtual ~FactoryHolder() {}
         inline Key key() const { return i_key; }
 
-        void RegisterSelf(void) { FactoryHolderRepository::Instance().InsertItem(this, i_key); }
-        void DeregisterSelf(void) { FactoryHolderRepository::Instance().RemoveItem(this, false); }
+        void RegisterSelf(void) { FactoryHolderRepository::instance()->InsertItem(this, i_key); }
+        void DeregisterSelf(void) { FactoryHolderRepository::instance()->RemoveItem(this, false); }
 
         /// Abstract Factory create method
         virtual T* Create(void *data = NULL) const = 0;
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index eaf8e1acd2d..11052a9f0a7 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -23,7 +23,7 @@
 
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
 #include <string>
 #include <vector>
@@ -94,11 +94,6 @@ class ObjectRegistry
             return i_registeredObjects;
         }
 
-    private:
-        RegistryMapType i_registeredObjects;
-        friend class Trinity::OperatorNew<ObjectRegistry<T, Key> >;
-
-        // protected for friend use since it should be a singleton
         ObjectRegistry() {}
         ~ObjectRegistry()
         {
@@ -106,6 +101,9 @@ class ObjectRegistry
                 delete iter->second;
             i_registeredObjects.clear();
         }
+    private:
+        RegistryMapType i_registeredObjects;
+        
 };
 #endif
 
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 0f27400dce2..7a34eaa0c0d 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -20,15 +20,12 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "Policies/SingletonImp.h"
 #include "Configuration/ConfigEnv.h"
 #include "Util.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
-INSTANTIATE_SINGLETON_1( Log );
-
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
     dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), 
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 53ce4e601b5..fb584d42c27 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_LOG_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include <ace/Singleton.h>
 #include "Database/DatabaseEnv.h"
 
 class Config;
@@ -82,9 +82,9 @@ enum ColorTypes
 
 const int Colors = int(WHITE)+1;
 
-class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_Thread_Mutex> >
+class Log
 {
-    friend class Trinity::OperatorNew<Log>;
+    friend class ACE_Singleton<Log, ACE_Thread_Mutex>;
     Log();
     ~Log();
 
@@ -172,10 +172,10 @@ class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_
         std::string m_dumpsDir;
 };
 
-#define sLog Trinity::Singleton<Log>::Instance()
+#define sLog (*ACE_Singleton<Log, ACE_Thread_Mutex>::instance())
 
 #ifdef TRINITY_DEBUG
-#define DEBUG_LOG Trinity::Singleton<Log>::Instance().outDebug
+#define DEBUG_LOG sLog.outDebug
 #else
 #define DEBUG_LOG
 #endif
diff --git a/src/server/shared/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h
deleted file mode 100644
index cc38d704e99..00000000000
--- a/src/server/shared/Policies/CreationPolicy.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_CREATIONPOLICY_H
-#define TRINITY_CREATIONPOLICY_H
-
-#include <stdlib.h>
-#include "Define.h"
-
-namespace Trinity
-{
-    /**
-     * OperatorNew policy creates an object on the heap using new.
-     */
-    template <class T>
-        class OperatorNew
-    {
-        public:
-            static T* Create(void) { return (new T); }
-            static void Destroy(T *obj) { delete obj; }
-    };
-
-    /**
-     * LocalStaticCreation policy creates an object on the stack
-     * the first time call Create.
-     */
-    template <class T>
-        class LocalStaticCreation
-    {
-        union MaxAlign
-        {
-            char t_[sizeof(T)];
-            short int shortInt_;
-            int int_;
-            long int longInt_;
-            float float_;
-            double double_;
-            long double longDouble_;
-            struct Test;
-            int Test::* pMember_;
-            int (Test::*pMemberFn_)(int);
-        };
-        public:
-            static T* Create(void)
-            {
-                static MaxAlign si_localStatic;
-                return new(&si_localStatic) T;
-            }
-
-            static void Destroy(T *obj) { obj->~T(); }
-    };
-
-    /**
-     * CreateUsingMalloc by pass the memory manger.
-     */
-    template<class T>
-        class CreateUsingMalloc
-    {
-        public:
-            static T* Create()
-            {
-                void* p = ::malloc(sizeof(T));
-                if (!p) return 0;
-                return new(p) T;
-            }
-
-            static void Destroy(T* p)
-            {
-                p->~T();
-                ::free(p);
-            }
-    };
-
-    /**
-     * CreateOnCallBack creates the object base on the call back.
-     */
-    template<class T, class CALL_BACK>
-        class CreateOnCallBack
-    {
-        public:
-            static T* Create()
-            {
-                return CALL_BACK::createCallBack();
-            }
-
-            static void Destroy(T *p)
-            {
-                CALL_BACK::destroyCallBack(p);
-            }
-    };
-}
-#endif
-
diff --git a/src/server/shared/Policies/ObjectLifeTime.cpp b/src/server/shared/Policies/ObjectLifeTime.cpp
deleted file mode 100644
index fd16873ae92..00000000000
--- a/src/server/shared/Policies/ObjectLifeTime.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <cstdlib>
-#include "ObjectLifeTime.h"
-
-namespace Trinity
-{
-    extern "C" void external_wrapper(void *p)
-    {
-        std::atexit( (void (*)())p );
-    }
-
-    void at_exit( void (*func)() )
-    {
-        external_wrapper((void*)func);
-    }
-}
-
diff --git a/src/server/shared/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h
deleted file mode 100644
index 205434cb613..00000000000
--- a/src/server/shared/Policies/ObjectLifeTime.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_OBJECTLIFETIME_H
-#define TRINITY_OBJECTLIFETIME_H
-
-#include <stdexcept>
-#include "Define.h"
-
-typedef void (* Destroyer)(void);
-
-namespace Trinity
-{
-    void at_exit( void (*func)() );
-
-    template <class T>
-        class ObjectLifeTime
-    {
-        public:
-            static void ScheduleCall(void (*destroyer)() )
-            {
-                at_exit( destroyer );
-            }
-
-            DECLSPEC_NORETURN static void OnDeadReference(void) ATTR_NORETURN;
-
-    };
-
-    template <class T>
-        void ObjectLifeTime<T>::OnDeadReference(void)       // We don't handle Dead Reference for now
-    {
-        throw std::runtime_error("Dead Reference");
-    }
-}
-#endif
-
diff --git a/src/server/shared/Policies/Singleton.h b/src/server/shared/Policies/Singleton.h
deleted file mode 100644
index da898558ca5..00000000000
--- a/src/server/shared/Policies/Singleton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_SINGLETON_H
-#define TRINITY_SINGLETON_H
-
-/**
- * @brief class Singleton
- */
-
-#include "CreationPolicy.h"
-#include "ThreadingModel.h"
-#include "ObjectLifeTime.h"
-
-namespace Trinity
-{
-    template
-        <
-        typename T,
-        class ThreadingModel = Trinity::SingleThreaded<T>,
-        class CreatePolicy = Trinity::OperatorNew<T>,
-        class LifeTimePolicy = Trinity::ObjectLifeTime<T>
-        >
-        class Singleton
-    {
-        public:
-            static T& Instance();
-
-        protected:
-            Singleton() {};
-
-        private:
-
-            // Prohibited actions...this does not prevent hijacking.
-            Singleton(const Singleton &);
-            Singleton& operator=(const Singleton &);
-
-            // Singleton Helpers
-            static void DestroySingleton();
-
-            // data structure
-            typedef typename ThreadingModel::Lock Guard;
-            static T *si_instance;
-            static bool si_destroyed;
-    };
-}
-#endif
-
diff --git a/src/server/shared/Policies/SingletonImp.h b/src/server/shared/Policies/SingletonImp.h
deleted file mode 100644
index 3e985cd5c64..00000000000
--- a/src/server/shared/Policies/SingletonImp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_SINGLETONIMPL_H
-#define TRINITY_SINGLETONIMPL_H
-
-#include "Singleton.h"
-
-// avoid the using namespace here cuz
-// its a .h file afterall
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-T&
-Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy >::Instance()
-{
-    if( !si_instance )
-    {
-        // double-checked Locking pattern
-        Guard();
-        if( !si_instance )
-        {
-            if( si_destroyed )
-            {
-                si_destroyed = false;
-                LifeTimePolicy::OnDeadReference();
-            }
-            si_instance = CreatePolicy::Create();
-            LifeTimePolicy::ScheduleCall(&DestroySingleton);
-        }
-    }
-
-    return *si_instance;
-}
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-void
-Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton()
-{
-    CreatePolicy::Destroy(si_instance);
-    si_instance = NULL;
-    si_destroyed = true;
-}
-
-#define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeType<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
-    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \
-    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false
-#endif
-
diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
deleted file mode 100644
index a792bf1b7d7..00000000000
--- a/src/server/shared/Policies/ThreadingModel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_THREADINGMODEL_H
-#define TRINITY_THREADINGMODEL_H
-
-/**
- * @class ThreadingModel<T>
- *
- */
-
-#include "Define.h"
-
-namespace Trinity
-{
-    inline void Guard(void *) {}
-
-    template<typename MUTEX> class GeneralLock
-    {
-        public:
-            GeneralLock(MUTEX &m) : i_mutex(m)
-            {
-                i_mutex.acquire();
-            }
-
-            ~GeneralLock()
-            {
-                i_mutex.release();
-            }
-        private:
-            GeneralLock(const GeneralLock &);
-            GeneralLock& operator=(const GeneralLock &);
-            MUTEX &i_mutex;
-    };
-
-    template <class T>
-        class SingleThreaded
-    {
-        public:
-
-            struct Lock                                     // empty object
-            {
-                Lock() {}
-                Lock(const T &) {}
-                Lock(const SingleThreaded<T> &)             // for single threaded we ignore this
-                {
-                }
-            };
-
-            typedef T VolatileType;
-    };
-
-    // object level lockable
-    template<class T, class MUTEX>
-        class ObjectLevelLockable
-    {
-        public:
-            ObjectLevelLockable() : i_mtx() {}
-
-            friend class Lock;
-
-            class Lock
-            {
-                public:
-                    Lock(ObjectLevelLockable<T, MUTEX> &host) : i_lock(host.i_mtx)
-                    {
-                    }
-
-                private:
-                    GeneralLock<MUTEX> i_lock;
-            };
-
-            typedef volatile T VolatileType;
-
-        private:
-            // prevent the compiler creating a copy construct
-            ObjectLevelLockable(const ObjectLevelLockable<T, MUTEX> &);
-            ObjectLevelLockable<T, MUTEX>& operator=(const ObjectLevelLockable<T, MUTEX> &);
-
-            MUTEX i_mtx;
-    };
-
-    template<class T, class MUTEX>
-        class ClassLevelLockable
-    {
-        public:
-            class Lock;
-            friend class Lock;
-            typedef volatile T VolatileType;
-
-            ClassLevelLockable() {}
-
-            class Lock
-            {
-                public:
-                    Lock(T& /*host*/) { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    Lock(ClassLevelLockable<T, MUTEX> &) { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    Lock() { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    ~Lock() { ClassLevelLockable<T, MUTEX>::si_mtx.release(); }
-            };
-
-        private:
-            static MUTEX si_mtx;
-    };
-
-}
-
-template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx;
-
-#define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
-    template class Trinity::ClassLevelLockable<CTYPE, MUTEX >
-#endif
-
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 332a607dcad..fb2d828e284 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -33,7 +33,6 @@
 #include "WorldSocketMgr.h"
 #include "Configuration/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
-#include "SingletonImp.h"
 
 #include "CliRunnable.h"
 #include "Log.h"
@@ -58,8 +57,6 @@ extern int m_ServiceStatus;
 /// \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
diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h
index 76ff2af1457..00628827e2a 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
@@ -43,6 +42,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/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index 3531873ec0c..69639da62fa 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -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/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 2c7310a7929..536939f9d5a 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -588,22 +588,6 @@
 				RelativePath="..\..\src\server\shared\Dynamic\UnorderedMap.h"
 				>
 			</File>
-			<Filter
-				Name="CountedReference"
-				>
-				<File
-					RelativePath="..\..\src\server\shared\Dynamic\CountedReference\Reference.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\server\shared\Dynamic\CountedReference\ReferenceHolder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\server\shared\Dynamic\CountedReference\ReferenceImpl.h"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="LinkedReference"
 				>
@@ -641,14 +625,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Policies"
-			>
-			<File
-				RelativePath="..\..\src\server\shared\Policies\ObjectLifeTime.cpp"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Threading"
 			>
-- 
cgit v1.2.3


From b6e180c17c0626a665cd189075e9d9b7f4b48d0d Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Mon, 28 Jun 2010 16:09:06 +0200
Subject: Add PreparedStatementHolder class that will be used for registering
 and calling prepared statements on the MySQL server. Information about
 prepared statements can be found here:
 http://dev.mysql.com/tech-resources/articles/4.1/prepared-statements.html In
 short: better performance shall ensue.

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt                  |  1 +
 src/server/shared/Database/PreparedStatements.cpp | 93 +++++++++++++++++++++++
 src/server/shared/Database/PreparedStatements.h   | 30 ++++++++
 win/VC90/shared.vcproj                            |  8 ++
 4 files changed, 132 insertions(+)
 create mode 100644 src/server/shared/Database/PreparedStatements.cpp
 create mode 100644 src/server/shared/Database/PreparedStatements.h

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 0fd58e63588..b3ededd8c62 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -94,6 +94,7 @@ set(trinitydatabase_STAT_SRCS
   Database/SQLStorage.cpp
   Database/SqlDelayThread.cpp
   Database/SqlOperations.cpp
+  Database/PreparedStatements.cpp
 )
 
 include_directories(
diff --git a/src/server/shared/Database/PreparedStatements.cpp b/src/server/shared/Database/PreparedStatements.cpp
new file mode 100644
index 00000000000..40a910acf9e
--- /dev/null
+++ b/src/server/shared/Database/PreparedStatements.cpp
@@ -0,0 +1,93 @@
+#include "PreparedStatements.h"
+
+void PreparedStatementHolder::_prepareStatement(const char* name, const char* sql, Database *db, uint32 &count)
+{
+    const char prefix[] = "PREPARE ";
+    size_t querySize = 8 + strlen(name) + 6 + strlen(sql) + 2 + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " FROM ");
+    strcat(query, "'");
+    strcat(query, sql);
+    strcat(query, "'");
+    
+    DEBUG_LOG("Preparing statement: %s", query);
+    db->Execute(query);
+    
+    delete[] query;
+    ++count;    
+}
+
+void PreparedStatementHolder::LoadAuthserver(Database *db, uint32 &count)
+{
+    _prepareStatement("auth_ping", "SELECT 1 FROM realmlist LIMIT 1", db, count);
+};
+
+void PreparedStatementHolder::Execute(Database *db, const char *name)
+{
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+
+    DEBUG_LOG("Prepared statement: %s", query);
+    db->Execute(query);
+    delete[] query;
+}
+
+void PreparedStatementHolder::PExecute(Database *db, const char *name, const char* args)
+{
+    // NOTE: if args == NULL, we're crashing here. No need to waste performance on checking;
+    // devs must make sure they use PExecute for args and Execute for no args.
+    
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " USING ");
+    strcat(query, args);
+    
+    DEBUG_LOG("Prepared statement (parsed args): %s", query);
+    db->Execute(query);
+    delete[] query;
+}
+
+QueryResult_AutoPtr PreparedStatementHolder::Query(Database *db, const char *name)
+{
+    QueryResult_AutoPtr _return = QueryResult_AutoPtr(NULL);
+
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+
+    DEBUG_LOG("Prepared statement with resultset: %s", query);
+    _return = db->Query(query);
+    delete[] query;
+    return _return;
+}
+
+QueryResult_AutoPtr PreparedStatementHolder::PQuery(Database *db, const char *name, const char *args)
+{
+    // NOTE: if args == NULL, we're crashing here. No need to waste performance on checking;
+    // devs must make sure they use PQuery for args and Query for no args.
+
+    QueryResult_AutoPtr _return = QueryResult_AutoPtr(NULL);
+
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " USING ");
+    strcat(query, args);
+
+    DEBUG_LOG("Prepared statement with resultset (parsed args): %s", query);
+    _return = db->Query(query);
+    delete[] query;
+    return _return;
+}
\ No newline at end of file
diff --git a/src/server/shared/Database/PreparedStatements.h b/src/server/shared/Database/PreparedStatements.h
new file mode 100644
index 00000000000..c19119dcb3d
--- /dev/null
+++ b/src/server/shared/Database/PreparedStatements.h
@@ -0,0 +1,30 @@
+#ifndef sPreparedStatement
+
+#include "ace/Singleton.h"
+#include "Database/DatabaseEnv.h"
+
+class PreparedStatementHolder
+{
+    public:
+        ///- Load prepare statements on database $db and increase $count for every statement
+        void LoadCharacters(Database *db, uint32 &count);
+        void LoadAuthserver(Database *db, uint32 &count);
+        void LoadWorldserver(Database *db, uint32 &count);
+        
+        ///- Executes prepared statement that doesn't require feedback with name $name on database $db
+        void Execute(Database *db, const char* name);
+        ///- Executes prepared statement that doesn't require feedback with name $name and args $args 
+        ///- on database $db
+        void PExecute(Database *db, const char* name, const char* args);
+        
+        ///- Executes a prepared statement without args on db $db with name $name and puts the result set in a pointer.
+        QueryResult_AutoPtr Query(Database* db, const char* name);
+        ///- Executes a prepared statement with args $args on db $db with name $name and put the result set in a pointer.
+        QueryResult_AutoPtr PQuery(Database* db, const char* name, const char* args);
+        
+    private:
+        void _prepareStatement(const char* name, const char* sql, Database *db, uint32 &count);
+
+};
+#define sPreparedStatement (*ACE_Singleton<PreparedStatementHolder, ACE_Null_Mutex>::instance())
+#endif
\ No newline at end of file
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 536939f9d5a..f3908ec4596 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -472,6 +472,14 @@
 				RelativePath="..\..\src\server\shared\Database\Field.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\server\shared\Database\PreparedStatements.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\server\shared\Database\PreparedStatements.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\server\shared\Database\QueryResult.cpp"
 				>
-- 
cgit v1.2.3


From 2ea043484d3efadf955c30d1d7fb10894ee465b7 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Wed, 30 Jun 2010 13:10:13 +0200
Subject: It is now possible to use CMake on windows for proper build (PCH
 support included) Merged PCH header into gamePCH since they became the same
 after these changes

--HG--
branch : trunk
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
---
 CMakeLists.txt                                    |   5 +
 cmake/FindPCHSupport.cmake                        |   4 +-
 externals/ace/CMakeLists.txt                      | 321 +++++++++++++++++++++-
 src/server/authserver/CMakeLists.txt              |  18 +-
 src/server/game/CMakeLists.txt                    |  17 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.cpp |   1 -
 src/server/game/PrecompiledHeaders/NixCorePCH.h   |  12 -
 src/server/game/PrecompiledHeaders/WinCorePCH.cpp |   1 -
 src/server/game/PrecompiledHeaders/WinCorePCH.h   |  14 -
 src/server/game/PrecompiledHeaders/gamePCH.cpp    |   1 +
 src/server/game/PrecompiledHeaders/gamePCH.h      |  12 +
 src/server/scripts/CMakeLists.txt                 |  21 +-
 src/server/shared/CMakeLists.txt                  |  16 ++
 src/server/worldserver/CMakeLists.txt             |  10 +-
 14 files changed, 402 insertions(+), 51 deletions(-)
 delete mode 100644 src/server/game/PrecompiledHeaders/NixCorePCH.cpp
 delete mode 100644 src/server/game/PrecompiledHeaders/NixCorePCH.h
 delete mode 100644 src/server/game/PrecompiledHeaders/WinCorePCH.cpp
 delete mode 100644 src/server/game/PrecompiledHeaders/WinCorePCH.h
 create mode 100644 src/server/game/PrecompiledHeaders/gamePCH.cpp
 create mode 100644 src/server/game/PrecompiledHeaders/gamePCH.h

(limited to 'src/server/shared')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0c4eb18e9e..e7118a2faa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,11 @@ endif()
 
 include(CheckIncludeFiles)
 include(cmake/FindPCHSupport.cmake)
+
+if(WIN32)
+  set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals)
+endif()
+
 include(cmake/FindACE.cmake)
 include(cmake/FindMySQL.cmake)
 include(cmake/FindOpenSSL.cmake)
diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake
index 4874808a0f9..d96a287e1a3 100644
--- a/cmake/FindPCHSupport.cmake
+++ b/cmake/FindPCHSupport.cmake
@@ -281,11 +281,11 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
         SET(oldProps "")
     endif(${oldProps} MATCHES NOTFOUND)
 
-    SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"")
+    SET(newProperties "${oldProps} /Yu\"${_input}.h\" /FI\"${_input}.h\"")
     SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
 
     #also inlude ${oldProps} to have the same compile options
-    SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"")
+    SET_SOURCE_FILES_PROPERTIES(${_input}.cpp PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}.h\"")
 
     else(CMAKE_GENERATOR MATCHES Visual*)
 
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
index fe2a2488d9f..db0dc7cdfee 100644
--- a/externals/ace/CMakeLists.txt
+++ b/externals/ace/CMakeLists.txt
@@ -8,17 +8,330 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB sources *.cpp)
-
+# NOTE: Do not use glob here, it would include files we don't want
 set(ace_STAT_SRCS
-  ${sources}
+  PrecompiledHeaders/WinAcePCH.cpp
+  ACE.cpp
+  ACE_crc32.cpp
+  ACE_crc_ccitt.cpp
+  ace_wchar.cpp
+  Activation_Queue.cpp
+  Active_Map_Manager.cpp
+  Addr.cpp
+  Argv_Type_Converter.cpp
+  Assert.cpp
+  Asynch_IO.cpp
+  Asynch_IO_Impl.cpp
+  Asynch_Pseudo_Task.cpp
+  ATM_Acceptor.cpp
+  ATM_Addr.cpp
+  ATM_Connector.cpp
+  ATM_Params.cpp
+  ATM_QoS.cpp
+  ATM_Stream.cpp
+  Atomic_Op.cpp
+  Atomic_Op_Sparc.c
+  Auto_Event.cpp
+  Barrier.cpp
+  Base_Thread_Adapter.cpp
+  Based_Pointer_Repository.cpp
+  Basic_Stats.cpp
+  Basic_Types.cpp
+  Capabilities.cpp
+  CDR_Base.cpp
+  CDR_Size.cpp
+  CDR_Stream.cpp
+  Cleanup.cpp
+  Codecs.cpp
+  Codeset_IBM1047.cpp
+  Codeset_Registry.cpp
+  Codeset_Registry_db.cpp
+  Condition_Recursive_Thread_Mutex.cpp
+  Condition_Thread_Mutex.cpp
+  Configuration.cpp
+  Configuration_Import_Export.cpp
+  Connection_Recycling_Strategy.cpp
+  Containers.cpp
+  Copy_Disabled.cpp
+  Countdown_Time.cpp
+  Date_Time.cpp
+  DEV.cpp
+  DEV_Addr.cpp
+  DEV_Connector.cpp
+  DEV_IO.cpp
+  Dev_Poll_Reactor.cpp
+  Dirent.cpp
+  Dirent_Selector.cpp
+  DLL.cpp
+  DLL_Manager.cpp
+  Dump.cpp
+  Dynamic.cpp
+  Dynamic_Message_Strategy.cpp
+  Dynamic_Service_Base.cpp
+  Dynamic_Service_Dependency.cpp
+  Encoding_Converter.cpp
+  Encoding_Converter_Factory.cpp
+  Event.cpp
+  Event_Handler.cpp
+  FIFO.cpp
+  FIFO_Recv.cpp
+  FIFO_Recv_Msg.cpp
+  FIFO_Send.cpp
+  FIFO_Send_Msg.cpp
+  FILE.cpp
+  FILE_Addr.cpp
+  FILE_Connector.cpp
+  FILE_IO.cpp
+  File_Lock.cpp
+  Filecache.cpp
+  Flag_Manip.cpp
+  Framework_Component.cpp
+  Functor.cpp
+  Functor_String.cpp
+  Get_Opt.cpp
+  gethrtime.cpp
+  Handle_Ops.cpp
+  Handle_Set.cpp
+  Hashable.cpp
+  High_Res_Timer.cpp
+  ICMP_Socket.cpp
+  INET_Addr.cpp
+  Init_ACE.cpp
+  IO_Cntl_Msg.cpp
+  IO_SAP.cpp
+  IOStream.cpp
+  IPC_SAP.cpp
+  Lib_Find.cpp
+  Local_Memory_Pool.cpp
+  Local_Name_Space.cpp
+  Local_Tokens.cpp
+  Lock.cpp
+  Log_Msg.cpp
+  Log_Msg_Backend.cpp
+  Log_Msg_Callback.cpp
+  Log_Msg_IPC.cpp
+  Log_Msg_NT_Event_Log.cpp
+  Log_Msg_UNIX_Syslog.cpp
+  Log_Record.cpp
+  Logging_Strategy.cpp
+  LSOCK.cpp
+  LSOCK_Acceptor.cpp
+  LSOCK_CODgram.cpp
+  LSOCK_Connector.cpp
+  LSOCK_Dgram.cpp
+  LSOCK_Stream.cpp
+  Malloc.cpp
+  Malloc_Allocator.cpp
+  Manual_Event.cpp
+  MEM_Acceptor.cpp
+  MEM_Addr.cpp
+  MEM_Connector.cpp
+  MEM_IO.cpp
+  Mem_Map.cpp
+  MEM_SAP.cpp
+  MEM_Stream.cpp
+  Message_Block.cpp
+  Message_Queue.cpp
+  Message_Queue_NT.cpp
+  Message_Queue_Vx.cpp
+  Method_Request.cpp
+  MMAP_Memory_Pool.cpp
+  Monitor_Admin.cpp
+  Monitor_Admin_Manager.cpp
+  Monitor_Base.cpp
+  Monitor_Control_Action.cpp
+  Monitor_Control_Types.cpp
+  Monitor_Point_Registry.cpp
+  Monitor_Size.cpp
+  Msg_WFMO_Reactor.cpp
+  Multihomed_INET_Addr.cpp
+  Mutex.cpp
+  Name_Proxy.cpp
+  Name_Request_Reply.cpp
+  Name_Space.cpp
+  Naming_Context.cpp
+  Netlink_Addr.cpp
+  Notification_Queue.cpp
+  Notification_Strategy.cpp
+  NT_Service.cpp
+  Obchunk.cpp
+  Object_Manager.cpp
+  Object_Manager_Base.cpp
+  OS_Errno.cpp
+  OS_Log_Msg_Attributes.cpp
+  OS_main.cpp
+  OS_NS_arpa_inet.cpp
+  OS_NS_ctype.cpp
+  OS_NS_dirent.cpp
+  OS_NS_dlfcn.cpp
+  OS_NS_errno.cpp
+  OS_NS_fcntl.cpp
+  OS_NS_math.cpp
+  OS_NS_netdb.cpp
+  OS_NS_poll.cpp
+  OS_NS_pwd.cpp
+  OS_NS_regex.cpp
+  OS_NS_signal.cpp
+  OS_NS_stdio.cpp
+  OS_NS_stdlib.cpp
+  OS_NS_string.cpp
+  OS_NS_strings.cpp
+  OS_NS_stropts.cpp
+  OS_NS_sys_mman.cpp
+  OS_NS_sys_msg.cpp
+  OS_NS_sys_resource.cpp
+  OS_NS_sys_select.cpp
+  OS_NS_sys_sendfile.cpp
+  OS_NS_sys_shm.cpp
+  OS_NS_sys_socket.cpp
+  OS_NS_sys_stat.cpp
+  OS_NS_sys_time.cpp
+  OS_NS_sys_uio.cpp
+  OS_NS_sys_utsname.cpp
+  OS_NS_sys_wait.cpp
+  OS_NS_Thread.cpp
+  OS_NS_time.cpp
+  OS_NS_unistd.cpp
+  OS_NS_wchar.cpp
+  OS_QoS.cpp
+  OS_Thread_Adapter.cpp
+  OS_TLI.cpp
+  Pagefile_Memory_Pool.cpp
+  Parse_Node.cpp
+  PI_Malloc.cpp
+  Ping_Socket.cpp
+  Pipe.cpp
+  POSIX_Asynch_IO.cpp
+  POSIX_CB_Proactor.cpp
+  POSIX_Proactor.cpp
+  Priority_Reactor.cpp
+  Proactor.cpp
+  Proactor_Impl.cpp
+  Process.cpp
+  Process_Manager.cpp
+  Process_Mutex.cpp
+  Process_Semaphore.cpp
+  Profile_Timer.cpp
+  Reactor.cpp
+  Reactor_Impl.cpp
+  Reactor_Notification_Strategy.cpp
+  Reactor_Timer_Interface.cpp
+  Read_Buffer.cpp
+  Recursive_Thread_Mutex.cpp
+  Recyclable.cpp
+  Registry.cpp
+  Registry_Name_Space.cpp
+  Remote_Name_Space.cpp
+  Remote_Tokens.cpp
+  Rtems_init.c
+  RW_Mutex.cpp
+  RW_Process_Mutex.cpp
+  RW_Thread_Mutex.cpp
+  Sample_History.cpp
+  Sbrk_Memory_Pool.cpp
+  Sched_Params.cpp
+  Select_Reactor_Base.cpp
+  Semaphore.cpp
+  Service_Config.cpp
+  Service_Gestalt.cpp
+  Service_Manager.cpp
+  Service_Object.cpp
+  Service_Repository.cpp
+  Service_Types.cpp
+  Shared_Memory.cpp
+  Shared_Memory_MM.cpp
+  Shared_Memory_Pool.cpp
+  Shared_Memory_SV.cpp
+  Shared_Object.cpp
+  Sig_Adapter.cpp
+  Sig_Handler.cpp
+  Signal.cpp
+  SOCK.cpp
+  SOCK_Acceptor.cpp
+  SOCK_CODgram.cpp
+  Sock_Connect.cpp
+  SOCK_Connector.cpp
+  SOCK_Dgram.cpp
+  SOCK_Dgram_Bcast.cpp
+  SOCK_Dgram_Mcast.cpp
+  SOCK_IO.cpp
+  SOCK_Netlink.cpp
+  SOCK_SEQPACK_Acceptor.cpp
+  SOCK_SEQPACK_Association.cpp
+  SOCK_SEQPACK_Connector.cpp
+  SOCK_Stream.cpp
+  SPIPE.cpp
+  SPIPE_Acceptor.cpp
+  SPIPE_Addr.cpp
+  SPIPE_Connector.cpp
+  SPIPE_Stream.cpp
+  SString.cpp
+  Stack_Trace.cpp
+  Stats.cpp
+  String_Base_Const.cpp
+  SUN_Proactor.cpp
+  SV_Message.cpp
+  SV_Message_Queue.cpp
+  SV_Semaphore_Complex.cpp
+  SV_Semaphore_Simple.cpp
+  SV_Shared_Memory.cpp
+  Svc_Conf_Lexer.cpp
+  Svc_Conf_y.cpp
+  Synch_Options.cpp
+  System_Time.cpp
+  Task.cpp
+  Thread.cpp
+  Thread_Adapter.cpp
+  Thread_Control.cpp
+  Thread_Exit.cpp
+  Thread_Hook.cpp
+  Thread_Manager.cpp
+  Thread_Mutex.cpp
+  Thread_Semaphore.cpp
+  Throughput_Stats.cpp
+  Time_Value.cpp
+  Timeprobe.cpp
+  TLI.cpp
+  TLI_Acceptor.cpp
+  TLI_Connector.cpp
+  TLI_Stream.cpp
+  Token.cpp
+  Token_Collection.cpp
+  Token_Invariants.cpp
+  Token_Manager.cpp
+  Token_Request_Reply.cpp
+  TP_Reactor.cpp
+  Trace.cpp
+  TSS_Adapter.cpp
+  TTY_IO.cpp
+  UNIX_Addr.cpp
+  UPIPE_Acceptor.cpp
+  UPIPE_Connector.cpp
+  UPIPE_Stream.cpp
+  UTF16_Encoding_Converter.cpp
+  UTF32_Encoding_Converter.cpp
+  UTF8_Encoding_Converter.cpp
+  UUID.cpp
+  WFMO_Reactor.cpp
+  WIN32_Asynch_IO.cpp
+  WIN32_Proactor.cpp
+  XML_Svc_Conf.cpp
+  XTI_ATM_Mcast.cpp
 )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/externals
+  ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/externals/zlib
 )
 
+# Needed for PCH support
+set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE CXX)
+
 add_definitions(-DACE_BUILD_DLL)
 
-add_library(ace STATIC ${ace_STAT_SRCS})
+add_library(ace SHARED ${ace_STAT_SRCS})
+
+if(DO_PCH)
+  add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH)
+endif()
\ No newline at end of file
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index e498673bf3a..956010da987 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -44,7 +44,9 @@ add_executable(authserver
 
 add_dependencies(authserver revision.h)
 
-add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
+if(NOT WIN32)
+  add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
+endif()
 
 set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
@@ -54,6 +56,18 @@ endif()
 
 set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
+if(WIN32)
+target_link_libraries(
+  authserver
+  shared
+  trinitydatabase
+  trinityauth
+  trinityconfig
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${OPENSSL_EXTRA_LIBRARIES}
+)
+else()
 target_link_libraries(
   authserver
   shared
@@ -64,7 +78,7 @@ target_link_libraries(
   ${OPENSSL_LIBRARIES}
   ${OSX_LIBS}
 )
-
+endif()
 ########### install files ###############
 
 install(TARGETS authserver DESTINATION bin)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index d2aa20fc6cc..f27d4df7d50 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -11,7 +11,7 @@
 ######## game ########
 
 # Enable precompiled headers when using the GCC compiler.
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH)
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
@@ -279,11 +279,22 @@ if(NOT DO_SCRIPTS)
   message("-- Added basic scriptAI-engines to GAME library")
 endif()
 
+# Add gamePCH.cpp to project on Windows
+if(MSVC)
+  set(game_STAT_SRCS
+    PrecompiledHeaders/gamePCH.cpp
+    ${game_STAT_SRCS})
+endif()
+
 add_library(game STATIC ${game_STAT_SRCS})
 
 add_dependencies(game revision.h)
 
 # Generate precompiled header
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-  add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
+if(DO_PCH)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH.h)
+  elseif(MSVC)
+    add_native_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH)
+  endif()
 endif()
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
deleted file mode 100644
index e3b0613cafd..00000000000
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "NixCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
deleted file mode 100644
index dd56e3fc16c..00000000000
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "Common.h"
-
-#include "MapManager.h"
-#include "Logging/Log.h"
-#include "ObjectAccessor.h"
-#include "ObjectDefines.h"
-#include "SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
-#include "ObjectMgr.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
deleted file mode 100644
index 240d73fa2c5..00000000000
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "WinCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
deleted file mode 100644
index e94a664b155..00000000000
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//add here most rarely modified headers to speed up debug build compilation
-#include "..\Server\WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "..\..\shared\Common.h"
-
-#include "..\Maps\MapManager.h"
-#include "..\..\shared\Logging\Log.h"
-#include "..\Globals\ObjectAccessor.h"
-#include "..\Entities\Object\ObjectDefines.h"
-#include "..\..\shared\Database/SQLStorage.h"
-#include "..\Protocol\Opcodes.h"
-#include "..\Miscellaneous\SharedDefines.h"
-#include "..\Globals\ObjectMgr.h"
-
-#include "ScriptPCH.h"
\ No newline at end of file
diff --git a/src/server/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp
new file mode 100644
index 00000000000..11e501ec7f2
--- /dev/null
+++ b/src/server/game/PrecompiledHeaders/gamePCH.cpp
@@ -0,0 +1 @@
+#include "gamePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h
new file mode 100644
index 00000000000..dd56e3fc16c
--- /dev/null
+++ b/src/server/game/PrecompiledHeaders/gamePCH.h
@@ -0,0 +1,12 @@
+//add here most rarely modified headers to speed up debug build compilation
+#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "Common.h"
+
+#include "MapManager.h"
+#include "Logging/Log.h"
+#include "ObjectAccessor.h"
+#include "ObjectDefines.h"
+#include "SQLStorage.h"
+#include "Opcodes.h"
+#include "SharedDefines.h"
+#include "ObjectMgr.h"
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 151e843fa96..1c55955c777 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -16,15 +16,13 @@ file(GLOB_RECURSE scripts_world World/*.cpp)
 file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH)
   include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
   )
 endif()
 
 set(scripts_STAT_SRCS
-  ../game/PrecompiledHeaders/ScriptPCH.cpp
-  ../game/PrecompiledHeaders/ScriptPCH.h
   ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
   ../game/AI/ScriptedAI/ScriptedCreature.cpp
   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -125,11 +123,20 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
+# Add ScriptPCH.cpp to project on Windows
+if(MSVC)
+set(scripts_STAT_SRCS
+    ../game/PrecompiledHeaders/ScriptPCH.cpp
+    ${scripts_STAT_SRCS})
+endif()
+
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-  add_precompiled_header(scripts
-    ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h
-  )
+if(DO_PCH)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    add_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
+  elseif(MSVC)
+    add_native_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH)
+  endif()
 endif()
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index b3ededd8c62..2c474e61693 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -20,6 +20,15 @@ set(shared_STAT_SRCS
   Common.cpp
 )
 
+# Windows specific files
+if(WIN32)
+  set(shared_STAT_SRCS
+    ${shared_STAT_SRCS}
+    Debugging/WheatyExceptionReport.cpp
+    Utilities/ServiceWin32.cpp
+  )
+endif()
+
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
@@ -43,10 +52,17 @@ include_directories(
 
 add_library(shared STATIC ${shared_STAT_SRCS})
 
+if(WIN32)
+target_link_libraries(
+  shared
+  ace
+)
+else()
 target_link_libraries(
   shared
   ${ACE_LIBRARY}
 )
+endif()
 
 ########### trinityconfig ###############
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 83fb4283877..823cc720e56 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -118,9 +118,9 @@ include_directories(
 set(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
-add_definitions(
-  -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
-)
+if(NOT WIN32)
+  add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
+endif()
 
 add_dependencies(worldserver revision.h)
 
@@ -152,11 +152,11 @@ if(WIN32)
     trinityconfig
     collision
     g3dlib
-    jemalloc
     ${SCRIPT_LIB}
-    ${ACE_LIBRARY}
+    ace
     ${MYSQL_LIBRARY}
     ${OPENSSL_LIBRARIES}
+    ${OPENSSL_EXTRA_LIBRARIES}
   )
 else()
   target_link_libraries(
-- 
cgit v1.2.3


From 673c652ba6e540d874e929dcc50f6c04ceae50c8 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Mon, 12 Jul 2010 00:30:17 +0200
Subject: change "IN_MILISECONDS" to proper english "IN_MILLISECONDS"

--HG--
branch : trunk
---
 src/server/game/AI/CoreAI/PetAI.cpp                |   2 +-
 src/server/game/Achievements/AchievementMgr.cpp    |   4 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   |   2 +-
 src/server/game/BattleGrounds/BattleGround.cpp     |  12 +--
 .../game/BattleGrounds/Zones/BattleGroundEY.h      |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundWS.cpp    |   4 +-
 src/server/game/Chat/Commands/Level0.cpp           |   2 +-
 src/server/game/Combat/ThreatManager.h             |   2 +-
 src/server/game/Entities/Creature/Creature.cpp     |  16 ++--
 src/server/game/Entities/Creature/Creature.h       |   2 +-
 src/server/game/Entities/GameObject/GameObject.h   |   2 +-
 src/server/game/Entities/Pet/Pet.cpp               |   8 +-
 src/server/game/Entities/Pet/Pet.h                 |   2 +-
 src/server/game/Entities/Player/Player.cpp         |  58 ++++++------
 src/server/game/Entities/Player/Player.h           |   2 +-
 src/server/game/Entities/Unit/Unit.cpp             |   8 +-
 src/server/game/Events/GameEventMgr.cpp            |   2 +-
 src/server/game/Grids/GridDefines.h                |   2 +-
 .../MovementGenerators/WaypointMovementGenerator.h |   2 +-
 .../Server/Protocol/Handlers/MovementHandler.cpp   |   2 +-
 src/server/game/Spells/Auras/SpellAuraEffects.cpp  |   8 +-
 src/server/game/Spells/Auras/SpellAuras.cpp        |   6 +-
 src/server/game/Spells/Auras/SpellEffects.cpp      |  22 ++---
 src/server/game/Spells/Spell.cpp                   |   4 +-
 src/server/game/Spells/SpellMgr.cpp                |  12 +--
 src/server/game/Weather/Weather.cpp                |   2 +-
 src/server/game/World/World.cpp                    |  34 +++----
 .../AlteracValley/alterac_valley.cpp               |  28 +++---
 .../EasternKingdoms/AlteracValley/boss_balinda.cpp |  32 +++----
 .../AlteracValley/boss_drekthar.cpp                |  24 ++---
 .../AlteracValley/boss_galvangar.cpp               |  24 ++---
 .../EasternKingdoms/AlteracValley/boss_vanndar.cpp |  20 ++---
 .../BlackrockSpire/blackrock_spire.cpp             |   2 +-
 .../BlackrockSpire/instance_blackrock_spire.cpp    |   2 +-
 .../EasternKingdoms/Karazhan/bosses_opera.cpp      |   6 +-
 .../scripts/EasternKingdoms/Karazhan/karazhan.cpp  |   2 +-
 .../MagistersTerrace/magisters_terrace.cpp         |   2 +-
 .../EasternKingdoms/MoltenCore/boss_golemagg.cpp   |  16 ++--
 .../Stratholme/boss_dathrohan_balnazzar.cpp        |   2 +-
 .../EasternKingdoms/ZulAman/boss_akilzon.cpp       |   2 +-
 .../EasternKingdoms/ZulAman/boss_janalai.cpp       |   2 +-
 .../Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp |   2 +-
 .../AzjolNerub/AzjolNerub/boss_anubarak.cpp        |  30 +++----
 .../AzjolNerub/AzjolNerub/boss_hadronox.cpp        |  24 ++---
 .../AzjolNerub/boss_krikthir_the_gatewatcher.cpp   | 100 ++++++++++-----------
 .../AzjolNerub/ahnkahet/boss_amanitar.cpp          |  22 ++---
 .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp       |  22 ++---
 .../AzjolNerub/ahnkahet/boss_herald_volazj.cpp     |  12 +--
 .../ahnkahet/boss_jedoga_shadowseeker.cpp          |  20 ++---
 .../AzjolNerub/ahnkahet/boss_prince_taldaram.cpp   |  26 +++---
 .../scripts/Northrend/DraktharonKeep/boss_dred.cpp |  30 +++----
 .../Northrend/DraktharonKeep/boss_novos.cpp        |  20 ++---
 .../Northrend/DraktharonKeep/boss_tharon_ja.cpp    |  40 ++++-----
 .../Northrend/DraktharonKeep/boss_trollgore.cpp    |  22 ++---
 .../Northrend/Gundrak/boss_drakkari_colossus.cpp   |  16 ++--
 src/server/scripts/Northrend/Gundrak/boss_eck.cpp  |  16 ++--
 .../scripts/Northrend/Gundrak/boss_gal_darah.cpp   |  30 +++----
 .../scripts/Northrend/Gundrak/boss_moorabi.cpp     |  16 ++--
 .../scripts/Northrend/Gundrak/boss_slad_ran.cpp    |  28 +++---
 .../Northrend/Nexus/Nexus/boss_anomalus.cpp        |  18 ++--
 .../Northrend/Nexus/Nexus/boss_keristrasza.cpp     |  16 ++--
 .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp  |  22 ++---
 .../scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp |  30 +++----
 .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp |   2 +-
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  |   2 +-
 .../Ulduar/HallsOfLightning/boss_ionar.cpp         |  18 ++--
 .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp     |   4 +-
 .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp     |  28 +++---
 .../Northrend/VioletHold/instance_violet_hold.cpp  |   8 +-
 .../SethekkHalls/instance_sethekk_halls.cpp        |   2 +-
 .../instance_hellfire_ramparts.cpp                 |   4 +-
 src/server/scripts/World/npcs_special.cpp          |   2 +-
 src/server/shared/Common.h                         |   2 +-
 73 files changed, 512 insertions(+), 512 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 09ec8fae53f..cae50668a3a 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -231,7 +231,7 @@ void PetAI::UpdateAllies()
     Unit* owner = me->GetCharmerOrOwner();
     Group *pGroup = NULL;
 
-    m_updateAlliesTimer = 10*IN_MILISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
+    m_updateAlliesTimer = 10*IN_MILLISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
 
     if (!owner)
         return;
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 137c22634fa..bb156c40ca6 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1797,7 +1797,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
         //has to exist else we wouldn't be here
         timedCompleted = IsCompletedCriteria(entry, sAchievementStore.LookupEntry(entry->referredAchievement));
         // Client expects this in packet
-        timeElapsed = entry->timeLimit - (timedIter->second/IN_MILISECONDS);
+        timeElapsed = entry->timeLimit - (timedIter->second/IN_MILLISECONDS);
 
         // Remove the timer, we wont need it anymore
         if (timedCompleted)
@@ -1841,7 +1841,7 @@ void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, u
         if (m_timedAchievements.find((*i)->ID) == m_timedAchievements.end() && !IsCompletedCriteria(*i, achievement))
         {
             // Start the timer
-            m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILISECONDS;
+            m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILLISECONDS;
 
             // and at client too
             SetCriteriaProgress(*i, 0, PROGRESS_SET);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 9b666b1b49c..95e1fb5e931 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -713,7 +713,7 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
     data << uint32(bid ? GetAuctionOutBid() : 0);
     //minimal outbid
     data << uint32(buyout);                                 //auction->buyout
-    data << uint32((expire_time-time(NULL))*IN_MILISECONDS);//time left
+    data << uint32((expire_time-time(NULL))*IN_MILLISECONDS);//time left
     data << uint64(bidder) ;                                //auction->bidder current
     data << uint32(bid);                                    //current bid
     return true;
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 2fc9a72df04..d9d6dc98a58 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -356,16 +356,16 @@ void BattleGround::Update(uint32 diff)
         {
             uint32 newtime = m_PrematureCountDownTimer - diff;
             // announce every minute
-            if (newtime > (MINUTE * IN_MILISECONDS))
+            if (newtime > (MINUTE * IN_MILLISECONDS))
             {
-                if (newtime / (MINUTE * IN_MILISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILISECONDS)));
+                if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)));
             }
             else
             {
                 //announce every 15 seconds
-                if (newtime / (15 * IN_MILISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILISECONDS));
+                if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS));
             }
             m_PrematureCountDownTimer = newtime;
         }
@@ -436,7 +436,7 @@ void BattleGround::Update(uint32 diff)
                             AuraApplication * aurApp = iter->second;
                             Aura * aura = aurApp->GetBase();
                             if (!aura->IsPermanent()
-                                && aura->GetDuration() <= 30*IN_MILISECONDS
+                                && aura->GetDuration() <= 30*IN_MILLISECONDS
                                 && aurApp->IsPositive()
                                 && (!(aura->GetSpellProto()->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
                                 && (!aura->HasEffectType(SPELL_AURA_MOD_INVISIBILITY)))
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index 4fe23c4c821..6b1ec6ced59 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -25,8 +25,8 @@
 
 class BattleGround;
 
-#define BG_EY_FLAG_RESPAWN_TIME         (8*IN_MILISECONDS) //8 seconds
-#define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILISECONDS)  //2 seconds
+#define BG_EY_FLAG_RESPAWN_TIME         (8*IN_MILLISECONDS) //8 seconds
+#define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILLISECONDS)  //2 seconds
 
 enum BG_EY_WorldStates
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 71872511274..12ccc331bab 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -70,7 +70,7 @@ void BattleGroundWS::Update(uint32 diff)
 
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
-        if (GetStartTime() >= 25*MINUTE*IN_MILISECONDS)        // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
+        if (GetStartTime() >= 25*MINUTE*IN_MILLISECONDS)        // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
         {
             if (GetTeamScore(ALLIANCE) == 0)
             {
@@ -91,7 +91,7 @@ void BattleGroundWS::Update(uint32 diff)
             else
                 EndBattleGround(ALLIANCE);
         }
-        else if (GetStartTime() > m_minutesElapsed*MINUTE*IN_MILISECONDS)
+        else if (GetStartTime() > m_minutesElapsed*MINUTE*IN_MILLISECONDS)
         {
             ++m_minutesElapsed;
             UpdateWorldState(BG_WS_STATE_TIMER, 25-m_minutesElapsed);
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index 53f2341c5af..be039479092 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -155,7 +155,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/)
 
     // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning
     uint32 save_interval = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
-    if ((save_interval == 0 || save_interval > 20*IN_MILISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILISECONDS))
+    if ((save_interval == 0 || save_interval > 20*IN_MILLISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILLISECONDS))
         player->SaveToDB();
 
     return true;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 4834ba28759..2903fe83c38 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -35,7 +35,7 @@ class Creature;
 class ThreatManager;
 struct SpellEntry;
 
-#define THREAT_UPDATE_INTERVAL 1 * IN_MILISECONDS    // Server should send threat update to client periodically each second
+#define THREAT_UPDATE_INTERVAL 1 * IN_MILLISECONDS    // Server should send threat update to client periodically each second
 
 //==============================================================
 // Class to calculate the real threat based
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index f1f5e7729a1..1d66385dada 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -620,7 +620,7 @@ void Creature::RegenerateMana()
         if ((*i)->GetMiscValue() == POWER_MANA)
             addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) * CREATURE_REGEN_INTERVAL / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) * CREATURE_REGEN_INTERVAL / (5 * IN_MILLISECONDS);
 
     ModifyPower(POWER_MANA, addvalue);
 }
@@ -657,7 +657,7 @@ void Creature::RegenerateHealth()
     for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
         addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * CREATURE_REGEN_INTERVAL  / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * CREATURE_REGEN_INTERVAL  / (5 * IN_MILLISECONDS);
 
     ModifyHealth(addvalue);
 }
@@ -1473,7 +1473,7 @@ void Creature::setDeathState(DeathState s)
 {
     if ((s == JUST_DIED && !m_isDeadByDefault)||(s == JUST_ALIVED && m_isDeadByDefault))
     {
-        m_deathTimer = m_corpseDelay*IN_MILISECONDS;
+        m_deathTimer = m_corpseDelay*IN_MILLISECONDS;
 
         // always save boss respawn time at death to prevent crash cheating
         if (sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY) || isWorldBoss())
@@ -1987,7 +1987,7 @@ void Creature::SaveRespawnTime()
     if (m_respawnTime > time(NULL))                          // dead (no corpse)
         objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime);
     else if (m_deathTimer > 0)                               // dead (corpse)
-        objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILISECONDS);
+        objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILLISECONDS);
 }
 
 // this should not be called by petAI or
@@ -2170,7 +2170,7 @@ void Creature::AddCreatureSpellCooldown(uint32 spellid)
         modOwner->ApplySpellMod(spellid, SPELLMOD_COOLDOWN, cooldown);
 
     if (cooldown)
-        _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILISECONDS);
+        _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILLISECONDS);
 
     if (spellInfo->Category)
         _AddCreatureCategoryCooldown(spellInfo->Category, time(NULL));
@@ -2189,7 +2189,7 @@ bool Creature::HasCategoryCooldown(uint32 spell_id) const
         return true;
 
     CreatureSpellCooldowns::const_iterator itr = m_CreatureCategoryCooldowns.find(spellInfo->Category);
-    return(itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILISECONDS)) > time(NULL));
+    return(itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILLISECONDS)) > time(NULL));
 }
 
 bool Creature::HasSpellCooldown(uint32 spell_id) const
@@ -2213,7 +2213,7 @@ time_t Creature::GetRespawnTimeEx() const
     if (m_respawnTime > now)                                 // dead (no corpse)
         return m_respawnTime;
     else if (m_deathTimer > 0)                               // dead (corpse)
-        return now+m_respawnDelay+m_deathTimer/IN_MILISECONDS;
+        return now+m_respawnDelay+m_deathTimer/IN_MILLISECONDS;
     else
         return now;
 }
@@ -2255,7 +2255,7 @@ void Creature::AllLootRemovedFromCorpse()
 
         // corpse was not skinnable -> apply corpse looted timer
         if (!cinfo || !cinfo->SkinLootId)
-            nDeathTimer = (uint32)((m_corpseDelay * IN_MILISECONDS) * sWorld.getRate(RATE_CORPSE_DECAY_LOOTED));
+            nDeathTimer = (uint32)((m_corpseDelay * IN_MILLISECONDS) * sWorld.getRate(RATE_CORPSE_DECAY_LOOTED));
         // corpse skinnable, but without skinning flag, and then skinned, corpse will despawn next update
         else
             nDeathTimer = 0;
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index ed3b4c6a5b4..9f58079efd0 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -66,7 +66,7 @@ enum CreatureFlagsExtra
 #endif
 
 #define MAX_KILL_CREDIT 2
-#define CREATURE_REGEN_INTERVAL 2 * IN_MILISECONDS
+#define CREATURE_REGEN_INTERVAL 2 * IN_MILLISECONDS
 
 // from `creature_template` table
 struct CreatureInfo
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 79c16cfd542..2c1765ea14e 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -479,7 +479,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_AREADAMAGE:    autoCloseTime = areadamage.autoCloseTime; break;
             default: break;
         }
-        return autoCloseTime / IN_MILISECONDS;              // prior to 3.0.3, conversion was / 0x10000;
+        return autoCloseTime / IN_MILLISECONDS;              // prior to 3.0.3, conversion was / 0x10000;
     }
 
     uint32 GetLootId() const
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 3e3eea67cca..1f0533ddcda 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -619,7 +619,7 @@ void Creature::Regenerate(Powers power)
         if ((*i)->GetMiscValue() == power)
             addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (isHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (isHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILLISECONDS);
 
     ModifyPower(power, (int32)addvalue);
 }
@@ -1112,7 +1112,7 @@ void Pet::_LoadSpellCooldowns()
                 continue;
 
             data << uint32(spell_id);
-            data << uint32(uint32(db_time-curTime)*IN_MILISECONDS);
+            data << uint32(uint32(db_time-curTime)*IN_MILLISECONDS);
 
             _AddCreatureSpellCooldown(spell_id,db_time);
 
@@ -1229,10 +1229,10 @@ void Pet::_LoadAuras(uint32 timediff)
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
-                if (remaintime/IN_MILISECONDS <= int32(timediff))
+                if (remaintime/IN_MILLISECONDS <= int32(timediff))
                     continue;
 
-                remaintime -= timediff*IN_MILISECONDS;
+                remaintime -= timediff*IN_MILLISECONDS;
             }
 
             // prevent wrong values of remaincharges
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 16e80170cd4..2c9b72b4fa6 100644
--- a/src/server/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
@@ -118,7 +118,7 @@ typedef std::vector<uint32> AutoSpellList;
 
 #define PET_FOLLOW_DIST  1
 #define PET_FOLLOW_ANGLE (M_PI/2)
-#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILISECONDS
+#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILLISECONDS
 
 class Player;
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8e93798ac1b..f8b485c36b5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -69,7 +69,7 @@
 #include "ConditionMgr.h"
 #include <cmath>
 
-#define ZONE_UPDATE_INTERVAL (1*IN_MILISECONDS)
+#define ZONE_UPDATE_INTERVAL (1*IN_MILLISECONDS)
 
 #define PLAYER_SKILL_INDEX(x)       (PLAYER_SKILL_INFO_1_1 + ((x)*3))
 #define PLAYER_SKILL_VALUE_INDEX(x) (PLAYER_SKILL_INDEX(x)+1)
@@ -477,7 +477,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
 
     m_swingErrorMsg = 0;
 
-    m_DetectInvTimer = 1*IN_MILISECONDS;
+    m_DetectInvTimer = 1*IN_MILLISECONDS;
 
     for (uint8 j = 0; j < PLAYER_MAX_BATTLEGROUND_QUEUES; ++j)
     {
@@ -1037,12 +1037,12 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
     switch (timer)
     {
         case FATIGUE_TIMER:
-            return MINUTE*IN_MILISECONDS;
+            return MINUTE*IN_MILLISECONDS;
         case BREATH_TIMER:
         {
             if (!isAlive() || HasAuraType(SPELL_AURA_WATER_BREATHING) || GetSession()->GetSecurity() >= sWorld.getConfig(CONFIG_DISABLE_BREATHING))
                 return DISABLED_MIRROR_TIMER;
-            int32 UnderWaterTime = 3*MINUTE*IN_MILISECONDS;
+            int32 UnderWaterTime = 3*MINUTE*IN_MILLISECONDS;
             AuraEffectList const& mModWaterBreathing = GetAuraEffectsByType(SPELL_AURA_MOD_WATER_BREATHING);
             for (AuraEffectList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
                 UnderWaterTime = uint32(UnderWaterTime * (100.0f + (*i)->GetAmount()) / 100.0f);
@@ -1052,7 +1052,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
         {
             if (!isAlive())
                 return DISABLED_MIRROR_TIMER;
-            return 1*IN_MILISECONDS;
+            return 1*IN_MILLISECONDS;
         }
         default:
             return 0;
@@ -1086,7 +1086,7 @@ void Player::HandleDrowning(uint32 time_diff)
             // Timer limit - need deal damage
             if (m_MirrorTimer[BREATH_TIMER] < 0)
             {
-                m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILLISECONDS;
                 // Calculate and deal damage
                 // TODO: Check this formula
                 uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
@@ -1122,7 +1122,7 @@ void Player::HandleDrowning(uint32 time_diff)
             // Timer limit - need deal damage or teleport ghost to graveyard
             if (m_MirrorTimer[FATIGUE_TIMER] < 0)
             {
-                m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILLISECONDS;
                 if (isAlive())                                            // Calculate and deal damage
                 {
                     uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
@@ -1155,7 +1155,7 @@ void Player::HandleDrowning(uint32 time_diff)
             m_MirrorTimer[FIRE_TIMER]-=time_diff;
             if (m_MirrorTimer[FIRE_TIMER] < 0)
             {
-                m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILLISECONDS;
                 // Calculate and deal damage
                 // TODO: Check this formula
                 uint32 damage = urand(600, 700);
@@ -1490,7 +1490,7 @@ void Player::Update(uint32 p_time)
     {
         m_drunkTimer += p_time;
 
-        if (m_drunkTimer > 10*IN_MILISECONDS)
+        if (m_drunkTimer > 10*IN_MILLISECONDS)
             HandleSobering();
     }
 
@@ -2243,7 +2243,7 @@ void Player::Regenerate(Powers power)
 
         // Butchery requires combat for this effect
         if (power != POWER_RUNIC_POWER || isInCombat())
-            addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * ((power != POWER_ENERGY) ? m_regenTimerCount : m_regenTimer) / (5 * IN_MILISECONDS);
+            addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * ((power != POWER_ENERGY) ? m_regenTimerCount : m_regenTimer) / (5 * IN_MILLISECONDS);
     }
 
     if (addvalue < 0.0f)
@@ -2321,7 +2321,7 @@ void Player::RegenerateHealth()
             for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
                 addvalue *= (100.0f + (*i)->GetAmount()) / 100.0f;
 
-            addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILISECONDS / (5 * IN_MILISECONDS);
+            addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILLISECONDS / (5 * IN_MILLISECONDS);
         }
         else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
             addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) / 100.0f;
@@ -2978,7 +2978,7 @@ void Player::SendInitialSpells()
             continue;
         }
 
-        time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILISECONDS : 0;
+        time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILLISECONDS : 0;
 
         if (sEntry->Category)                                // may be wrong, but anyway better than nothing...
         {
@@ -3856,8 +3856,8 @@ void Player::RemoveArenaSpellCooldowns()
         SpellEntry const * entry = sSpellStore.LookupEntry(itr->first);
         // check if spellentry is present and if the cooldown is less than 10 mins
         if (entry &&
-            entry->RecoveryTime <= 10 * MINUTE * IN_MILISECONDS &&
-            entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILISECONDS)
+            entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS &&
+            entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILLISECONDS)
         {
             // remove & notify
             RemoveSpellCooldown(itr->first, true);
@@ -4645,7 +4645,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
 
             if (Aura * aur = GetAura(15007, GetGUID()))
             {
-                aur->SetDuration(delta*IN_MILISECONDS);
+                aur->SetDuration(delta*IN_MILLISECONDS);
             }
         }
     }
@@ -4698,7 +4698,7 @@ void Player::KillPlayer()
     ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable());
 
     // 6 minutes until repop at graveyard
-    m_deathTimer = 6*MINUTE*IN_MILISECONDS;
+    m_deathTimer = 6*MINUTE*IN_MILLISECONDS;
 
     UpdateCorpseReclaimDelay();                             // dependent at use SetDeathPvP() call before kill
     SendCorpseReclaimDelay();
@@ -14213,10 +14213,10 @@ void Player::AddQuest(Quest const *pQuest, Object *questGiver)
 
         // shared timed quest
         if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER)
-            limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].m_timer / IN_MILISECONDS;
+            limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].m_timer / IN_MILLISECONDS;
 
         AddTimedQuest(quest_id);
-        questStatusData.m_timer = limittime * IN_MILISECONDS;
+        questStatusData.m_timer = limittime * IN_MILLISECONDS;
         qtime = static_cast<uint32>(time(NULL)) + limittime;
     }
     else
@@ -16550,10 +16550,10 @@ void Player::_LoadAuras(QueryResult_AutoPtr result, uint32 timediff)
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
-                if (remaintime/IN_MILISECONDS <= int32(timediff))
+                if (remaintime/IN_MILLISECONDS <= int32(timediff))
                     continue;
 
-                remaintime -= timediff*IN_MILISECONDS;
+                remaintime -= timediff*IN_MILLISECONDS;
             }
 
             // prevent wrong values of remaincharges
@@ -16979,7 +16979,7 @@ void Player::_LoadQuestStatus(QueryResult_AutoPtr result)
                     if (quest_time <= sWorld.GetGameTime())
                         questStatusData.m_timer = 1;
                     else
-                        questStatusData.m_timer = (quest_time - sWorld.GetGameTime()) * IN_MILISECONDS;
+                        questStatusData.m_timer = (quest_time - sWorld.GetGameTime()) * IN_MILLISECONDS;
                 }
                 else
                     quest_time = 0;
@@ -18023,11 +18023,11 @@ void Player::_SaveQuestStatus()
             case QUEST_NEW :
                 CharacterDatabase.PExecute("INSERT INTO character_queststatus (guid,quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4) "
                     "VALUES ('%u', '%u', '%u', '%u', '%u', '" UI64FMTD "', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')",
-                    GetGUIDLow(), i->first, i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILISECONDS+ sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3]);
+                    GetGUIDLow(), i->first, i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILLISECONDS+ sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3]);
                 break;
             case QUEST_CHANGED :
                 CharacterDatabase.PExecute("UPDATE character_queststatus SET status = '%u',rewarded = '%u',explored = '%u',timer = '" UI64FMTD "',mobcount1 = '%u',mobcount2 = '%u',mobcount3 = '%u',mobcount4 = '%u',itemcount1 = '%u',itemcount2 = '%u',itemcount3 = '%u',itemcount4 = '%u'  WHERE guid = '%u' AND quest = '%u' ",
-                    i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILISECONDS + sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3], GetGUIDLow(), i->first);
+                    i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILLISECONDS + sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3], GetGUIDLow(), i->first);
                 break;
             case QUEST_UNCHANGED:
                 break;
@@ -18725,7 +18725,7 @@ void Player::PetSpellInitialize()
 
     for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr)
     {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
+        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
 
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
@@ -18735,7 +18735,7 @@ void Player::PetSpellInitialize()
 
     for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr)
     {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
+        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
 
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
@@ -19513,7 +19513,7 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs)
         {
             data << uint32(unSpellId);
             data << uint32(unTimeMs);                       // in m.secs
-            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs/IN_MILISECONDS);
+            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs/IN_MILLISECONDS);
         }
     }
     GetSession()->SendPacket(&data);
@@ -20009,8 +20009,8 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
         if (rec == 0 && catrec == 0)
             return;
 
-        catrecTime = catrec ? curTime+catrec/IN_MILISECONDS : 0;
-        recTime    = rec ? curTime+rec/IN_MILISECONDS : catrecTime;
+        catrecTime = catrec ? curTime+catrec/IN_MILLISECONDS : 0;
+        recTime    = rec ? curTime+rec/IN_MILLISECONDS : catrecTime;
     }
 
     // self spell cooldown
@@ -22024,7 +22024,7 @@ void Player::SendCorpseReclaimDelay(bool load)
 
     //! corpse reclaim delay 30 * 1000ms or longer at often deaths
     WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4);
-    data << uint32(delay*IN_MILISECONDS);
+    data << uint32(delay*IN_MILLISECONDS);
     GetSession()->SendPacket(&data);
 }
 
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 765b5185bf6..eeb45cab4cb 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2118,7 +2118,7 @@ class Player : public Unit, public GridObject<Player>
         /***                    REST SYSTEM                    ***/
         /*********************************************************/
 
-        bool isRested() const { return GetRestTime() >= 10*IN_MILISECONDS; }
+        bool isRested() const { return GetRestTime() >= 10*IN_MILLISECONDS; }
         uint32 GetXPRestBonus(uint32 xp);
         uint32 GetRestTime() const { return m_restTime;}
         void SetRestTime(uint32 v) { m_restTime = v;}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d52554fabf6..f32e41a73b4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4176,7 +4176,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
             }
             else
             {
-                int32 dur = 2*MINUTE*IN_MILISECONDS < aura->GetDuration() ? 2*MINUTE*IN_MILISECONDS : aura->GetDuration();
+                int32 dur = 2*MINUTE*IN_MILLISECONDS < aura->GetDuration() ? 2*MINUTE*IN_MILLISECONDS : aura->GetDuration();
 
                 newAura = Aura::TryCreate(aura->GetSpellProto(), effMask, stealer, NULL, &baseDamage[0], NULL, aura->GetCasterGUID());
                 if (!newAura)
@@ -12671,7 +12671,7 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
                 {
                     // Glyph of Thorns
                     if (AuraEffect * aurEff = GetAuraEffect(57862, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 break;
             case SPELLFAMILY_PALADIN:
@@ -12679,13 +12679,13 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
                 {
                     // Glyph of Blessing of Might
                     if (AuraEffect * aurEff = GetAuraEffect(57958, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 else if (spellProto->SpellFamilyFlags[0] & 0x00010000)
                 {
                     // Glyph of Blessing of Wisdom
                     if (AuraEffect * aurEff = GetAuraEffect(57979, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 break;
         }
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 889d228b0a2..f0500e177bb 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1151,7 +1151,7 @@ uint32 GameEventMgr::Update()                               // return the next e
     for (std::set<uint16>::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr)
         StopEvent(*itr);
     sLog.outDetail("Next game event check in %u seconds.", nextEventDelay + 1);
-    return (nextEventDelay + 1) * IN_MILISECONDS;           // Add 1 second to be sure event has started/stopped at next call
+    return (nextEventDelay + 1) * IN_MILLISECONDS;           // Add 1 second to be sure event has started/stopped at next call
 }
 
 void GameEventMgr::UnApplyEvent(uint16 event_id)
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index e59bb6aa8a0..620b8dd2a03 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -42,7 +42,7 @@ class Player;
 
 #define CENTER_GRID_OFFSET      (SIZE_OF_GRIDS/2)
 
-#define MIN_GRID_DELAY          (MINUTE*IN_MILISECONDS)
+#define MIN_GRID_DELAY          (MINUTE*IN_MILLISECONDS)
 #define MIN_MAP_UPDATE_DELAY    50
 
 #define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index c6d89ecd9b3..cce0eff290e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -39,7 +39,7 @@
 #include <set>
 
 #define FLIGHT_TRAVEL_UPDATE  100
-#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILISECONDS           // 3 Minutes
+#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILLISECONDS           // 3 Minutes
 #define TIMEDIFF_NEXT_WP      250
 
 template<class T, class P>
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 56a8c9cd6da..a31361e9275 100644
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -198,7 +198,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
     uint32 flags, time;
     recv_data >> flags >> time;
     DEBUG_LOG("Guid " UI64FMTD, guid);
-    DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILISECONDS);
+    DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILLISECONDS);
 
     Unit *mover = _player->m_mover;
     Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 8be639241d7..69c576a5363 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -733,7 +733,7 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
         case SPELL_AURA_OBS_MOD_POWER:
             // 3 spells have no amplitude set
             if (!m_amplitude)
-                m_amplitude = 1 * IN_MILISECONDS;
+                m_amplitude = 1 * IN_MILLISECONDS;
         case SPELL_AURA_PERIODIC_DAMAGE:
         case SPELL_AURA_PERIODIC_HEAL:
         case SPELL_AURA_PERIODIC_ENERGIZE:
@@ -762,7 +762,7 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
             {
                 m_isPeriodic = true;
                 m_amplitude = irand (0, 60) + 30;
-                m_amplitude *= IN_MILISECONDS;
+                m_amplitude *= IN_MILLISECONDS;
             }
             break;
     }
@@ -1047,7 +1047,7 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
             if (GetId() == 7057)
             {
                 m_amplitude = irand (0 , 60) + 30;
-                m_amplitude *= IN_MILISECONDS;
+                m_amplitude *= IN_MILLISECONDS;
             }
             break;
         case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
@@ -3125,7 +3125,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode,
             // for players, start regeneration after 1s (in polymorph fast regeneration case)
             // only if caster is Player (after patch 2.4.2)
             if (IS_PLAYER_GUID(GetCasterGUID()))
-                target->ToPlayer()->setRegenTimerCount(1*IN_MILISECONDS);
+                target->ToPlayer()->setRegenTimerCount(1*IN_MILLISECONDS);
 
             //dismount polymorphed target (after patch 2.4.2)
             if (target->IsMounted())
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index cb6ddfb2307..e3b155dac08 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -306,7 +306,7 @@ m_spellProto(spellproto), m_owner(owner), m_casterGuid(casterGUID ? casterGUID :
     m_procCharges(0), m_stackAmount(1), m_isRemoved(false), m_casterLevel(caster ? caster->getLevel() : m_spellProto->spellLevel)
 {
     if (m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
-        m_timeCla = 1 * IN_MILISECONDS;
+        m_timeCla = 1 * IN_MILLISECONDS;
 
     Player* modOwner = NULL;
 
@@ -699,7 +699,7 @@ void Aura::RefreshDuration()
             m_effects[i]->ResetPeriodic();
 
     if (m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
-        m_timeCla = 1 * IN_MILISECONDS;
+        m_timeCla = 1 * IN_MILLISECONDS;
 }
 
 void Aura::SetCharges(uint8 charges)
@@ -1290,7 +1290,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                             data << uint64(player->GetGUID());
                             data << uint8(0x0);                                     // flags (0x1, 0x2)
                             data << uint32(GetSpellProto()->Id);
-                            data << uint32(aurEff->GetAmount()*IN_MILISECONDS);
+                            data << uint32(aurEff->GetAmount()*IN_MILLISECONDS);
                             player->SendDirectMessage(&data);
                         }
                         break;
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index f819e3f1971..3f01d8bca2d 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -727,7 +727,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     // Add main hand dps * effect[2] amount
                     float average = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2;
                     int32 count = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, 2);
-                    damage += count * int32(average * IN_MILISECONDS) / m_caster->GetAttackTime(BASE_ATTACK);
+                    damage += count * int32(average * IN_MILLISECONDS) / m_caster->GetAttackTime(BASE_ATTACK);
                 }
                 // Shield of Righteousness
                 else if (m_spellInfo->SpellFamilyFlags[1]&0x00100000)
@@ -3946,7 +3946,7 @@ void Spell::EffectDistract(uint32 /*i*/)
         // Set creature Distracted, Stop it, And turn it
         unitTarget->SetOrientation(angle);
         unitTarget->StopMoving();
-        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILISECONDS);
+        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
     }
 }
 
@@ -4873,7 +4873,7 @@ void Spell::EffectSummonObjectWild(uint32 i)
 
     int32 duration = GetSpellDuration(m_spellInfo);
 
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
 
     // Wild object not have owner and check clickable by players
@@ -4916,7 +4916,7 @@ void Spell::EffectSummonObjectWild(uint32 i)
         if (linkedGO->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, map,
             m_caster->GetPhaseMask(), x, y, z, target->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
         {
-            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
             linkedGO->SetSpellId(m_spellInfo->Id);
 
             // Wild object not have owner and check clickable by players
@@ -6507,7 +6507,7 @@ void Spell::EffectDuel(uint32 i)
     pGameObj->SetUInt32Value(GAMEOBJECT_FACTION, m_caster->getFaction());
     pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()+1);
     int32 duration = GetSpellDuration(m_spellInfo);
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
 
     m_caster->AddGameObject(pGameObj);
@@ -6585,7 +6585,7 @@ void Spell::EffectSummonPlayer(uint32 /*i*/)
     WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4);
     data << uint64(m_caster->GetGUID());                    // summoner guid
     data << uint32(m_caster->GetZoneId());                  // summoner zone
-    data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILISECONDS); // auto decline after msecs
+    data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILLISECONDS); // auto decline after msecs
     unitTarget->ToPlayer()->GetSession()->SendPacket(&data);
 }
 
@@ -6683,7 +6683,7 @@ void Spell::EffectEnchantHeldItem(uint32 i)
             return;
 
         // Apply the temporary enchantment
-        item->SetEnchantment(slot, enchant_id, duration*IN_MILISECONDS, 0);
+        item->SetEnchantment(slot, enchant_id, duration*IN_MILLISECONDS, 0);
         item_owner->ApplyEnchantment(item, slot, true);
     }
 }
@@ -6813,7 +6813,7 @@ void Spell::EffectSummonObject(uint32 i)
 
     //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel());
     int32 duration = GetSpellDuration(m_spellInfo);
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
     m_caster->AddGameObject(pGameObj);
 
@@ -7445,7 +7445,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
                 case 3: lastSec = 17; break;
             }
 
-            duration = duration - lastSec*IN_MILISECONDS + FISHING_BOBBER_READY_TIME*IN_MILISECONDS;
+            duration = duration - lastSec*IN_MILLISECONDS + FISHING_BOBBER_READY_TIME*IN_MILLISECONDS;
             break;
         }
         case GAMEOBJECT_TYPE_SUMMONING_RITUAL:
@@ -7466,7 +7466,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
             break;
     }
 
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
 
     pGameObj->SetOwnerGUID(m_caster->GetGUID());
 
@@ -7485,7 +7485,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
         if (linkedGO->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, cMap,
             m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
         {
-            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
             //linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel());
             linkedGO->SetSpellId(m_spellInfo->Id);
             linkedGO->SetOwnerGUID(m_caster->GetGUID());
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index bf00f54b110..c3b0fdb1405 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -52,7 +52,7 @@
 #include "ScriptMgr.h"
 #include "ConditionMgr.h"
 
-#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS)
+#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILLISECONDS)
 
 extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
 
@@ -4772,7 +4772,7 @@ SpellCastResult Spell::CheckCast(bool strict)
     // - with greater than 10 min CD without SPELL_ATTR_EX4_USABLE_IN_ARENA flag
     // - with SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA flag
     if ((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA) ||
-        GetSpellRecoveryTime(m_spellInfo) > 10 * MINUTE * IN_MILISECONDS && !(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_USABLE_IN_ARENA))
+        GetSpellRecoveryTime(m_spellInfo) > 10 * MINUTE * IN_MILLISECONDS && !(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_USABLE_IN_ARENA))
         if (MapEntry const* mapEntry = sMapStore.LookupEntry(m_caster->GetMapId()))
             if (mapEntry->IsBattleArena())
                 return SPELL_FAILED_NOT_IN_ARENA;
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f23b112cbc8..7fd3650d6f4 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2876,38 +2876,38 @@ int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry cons
         {
             // Wyvern Sting
             if (spellproto->SpellFamilyFlags[1] & 0x1000)
-                return 6 * IN_MILISECONDS;
+                return 6 * IN_MILLISECONDS;
             // Hunter's Mark
             if (spellproto->SpellFamilyFlags[0] & 0x400)
-                return 120 * IN_MILISECONDS;
+                return 120 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_PALADIN:
         {
             // Repentance - limit to 6 seconds in PvP
             if (spellproto->SpellFamilyFlags[0] & 0x4)
-                return 6 * IN_MILISECONDS;
+                return 6 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_DRUID:
         {
             // Faerie Fire - limit to 40 seconds in PvP (3.1)
             if (spellproto->SpellFamilyFlags[0] & 0x400)
-                return 40 * IN_MILISECONDS;
+                return 40 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_PRIEST:
         {
             // Vampiric Embrace - limit to 60 seconds in PvP (3.1)
             if ((spellproto->SpellFamilyFlags[0] & 0x4) && spellproto->SpellIconID == 150)
-                return 60 * IN_MILISECONDS;
+                return 60 * IN_MILLISECONDS;
             break;
         }
         default:
             break;
     }
 
-    return 10 * IN_MILISECONDS;
+    return 10 * IN_MILLISECONDS;
 }
 
 bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index d74f945fd5a..0bfb7f19345 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -37,7 +37,7 @@ Weather::Weather(uint32 zone, WeatherZoneChances const* weatherChances) : m_zone
     m_type = WEATHER_TYPE_FINE;
     m_grade = 0;
 
-    sLog.outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILISECONDS)));
+    sLog.outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILLISECONDS)));
 }
 
 /// Launch a weather update
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 27de78412a7..04a709e75f5 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -614,7 +614,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_MAIL_LEVEL_REQ] = sConfig.GetIntDefault("LevelReq.Mail", 1);
     m_configs[CONFIG_ALLOW_PLAYER_COMMANDS] = sConfig.GetBoolDefault("AllowPlayerCommands", 1);
     m_configs[CONFIG_GRID_UNLOAD] = sConfig.GetBoolDefault("GridUnload", true);
-    m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_INTERVAL_DISCONNECT_TOLERANCE] = sConfig.GetIntDefault("DisconnectToleranceInterval", 0);
     m_configs[CONFIG_STATS_SAVE_ONLY_ON_LOGOUT] = sConfig.GetBoolDefault("PlayerSave.Stats.SaveOnlyOnLogout", true);
 
@@ -625,7 +625,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_MIN_LEVEL_STAT_SAVE] = 0;
     }
 
-    m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILLISECONDS);
     if (m_configs[CONFIG_INTERVAL_GRIDCLEAN] < MIN_GRID_DELAY)
     {
         sLog.outError("GridCleanUpDelay (%i) must be greater %u. Use this minimal value.",m_configs[CONFIG_INTERVAL_GRIDCLEAN],MIN_GRID_DELAY);
@@ -643,7 +643,7 @@ void World::LoadConfigSettings(bool reload)
     if (reload)
         sMapMgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
 
-    m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILLISECONDS);
 
     if (reload)
     {
@@ -863,7 +863,7 @@ void World::LoadConfigSettings(bool reload)
 
     m_configs[CONFIG_CAST_UNSTUCK] = sConfig.GetBoolDefault("CastUnstuck", true);
     m_configs[CONFIG_INSTANCE_RESET_TIME_HOUR]  = sConfig.GetIntDefault("Instance.ResetTimeHour", 4);
-    m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILLISECONDS);
 
     m_configs[CONFIG_MAX_PRIMARY_TRADE_SKILL] = sConfig.GetIntDefault("MaxPrimaryTradeSkill", 2);
     m_configs[CONFIG_MIN_PETITION_SIGNS] = sConfig.GetIntDefault("MinPetitionSigns", 9);
@@ -911,7 +911,7 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
     {
-        m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILISECONDS);
+        m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILLISECONDS);
         m_timers[WUPDATE_UPTIME].Reset();
     }
 
@@ -924,7 +924,7 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
     {
-        m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL] * MINUTE * IN_MILISECONDS);
+        m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL] * MINUTE * IN_MILLISECONDS);
         m_timers[WUPDATE_CLEANDB].Reset();
     }
     m_configs[CONFIG_LOGDB_CLEARTIME] = sConfig.GetIntDefault("LogDB.Opt.ClearTime", 1209600); // 14 days default
@@ -1059,11 +1059,11 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE]       = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.Enable", false);
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY]   = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.PlayerOnly", false);
     m_configs[CONFIG_BATTLEGROUND_INVITATION_TYPE]              = sConfig.GetIntDefault ("Battleground.InvitationType", 0);
-    m_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER]       = sConfig.GetIntDefault ("BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILISECONDS);
-    m_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfig.GetIntDefault ("BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER]       = sConfig.GetIntDefault ("BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILLISECONDS);
+    m_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfig.GetIntDefault ("BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_BG_XP_FOR_KILL]                            = sConfig.GetBoolDefault("Battleground.GiveXPForKills", false);
     m_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE]               = sConfig.GetIntDefault ("Arena.MaxRatingDifference", 150);
-    m_configs[CONFIG_ARENA_RATING_DISCARD_TIMER]                = sConfig.GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_ARENA_RATING_DISCARD_TIMER]                = sConfig.GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS]              = sConfig.GetBoolDefault("Arena.AutoDistributePoints", false);
     m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS]       = sConfig.GetIntDefault ("Arena.AutoDistributeInterval", 7);
     m_configs[CONFIG_ARENA_QUEUE_ANNOUNCER_ENABLE]              = sConfig.GetBoolDefault("Arena.QueueAnnouncer.Enable", false);
@@ -1637,24 +1637,24 @@ void World::SetInitialWorldSettings()
 
     static uint32 abtimer = 0;
     abtimer = sConfig.GetIntDefault("AutoBroadcast.Timer", 60000);
-    m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILISECONDS/2);
+    m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILLISECONDS/2);
     m_timers[WUPDATE_SESSIONS].SetInterval(0);
-    m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILISECONDS);
-    m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILISECONDS);
-    m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS);
+    m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS);
+    m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILLISECONDS);
                                                             //Update "uptime" table based on configuration entry in minutes.
-    m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*IN_MILLISECONDS);
                                                             //erase corpses every 20 minutes
-    m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILLISECONDS);
                                                             // clean logs table every 14 days by default
     m_timers[WUPDATE_AUTOBROADCAST].SetInterval(abtimer);
 
     //to set mailtimer to return mails every day between 4 and 5 am
     //mailtimer is increased when updating auctions
     //one second is 1000 -(tested on win system)
-    mail_timer = ((((localtime(&m_gameTime)->tm_hour + 20) % 24)* HOUR * IN_MILISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval());
+    mail_timer = ((((localtime(&m_gameTime)->tm_hour + 20) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval());
                                                             //1440
-    mail_timer_expires = ((DAY * IN_MILISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
+    mail_timer_expires = ((DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
     sLog.outDebug("Mail timer set to: %u, mail return is called every %u minutes", mail_timer, mail_timer_expires);
 
     ///- Initilize static helper structures
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 1f6821d7493..7592742ef23 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -63,13 +63,13 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
 
     void Reset()
     {
-        uiChargeTimer = urand(2*IN_MILISECONDS,12*IN_MILISECONDS);
-        uiCleaveTimer = urand(1*IN_MILISECONDS,11*IN_MILISECONDS);
-        uiDemoralizingShoutTimer = urand(2*IN_MILISECONDS,2*IN_MILISECONDS);
-        uiWhirlwind1Timer = urand(1*IN_MILISECONDS,12*IN_MILISECONDS);
-        uiWhirlwind2Timer = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiEnrageTimer = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiResetTimer = 5*IN_MILISECONDS;
+        uiChargeTimer = urand(2*IN_MILLISECONDS,12*IN_MILLISECONDS);
+        uiCleaveTimer = urand(1*IN_MILLISECONDS,11*IN_MILLISECONDS);
+        uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS,2*IN_MILLISECONDS);
+        uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,12*IN_MILLISECONDS);
+        uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiEnrageTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiResetTimer = 5*IN_MILLISECONDS;
 
         bHasAura = false;
     }
@@ -120,37 +120,37 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
         if (uiChargeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CHARGE);
-            uiChargeTimer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiChargeTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiChargeTimer -= diff;
 
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE);
-            uiCleaveTimer =  urand(10*IN_MILISECONDS,16*IN_MILISECONDS);
+            uiCleaveTimer =  urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS);
         } else uiCleaveTimer -= diff;
 
         if (uiDemoralizingShoutTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_DEMORALIZING_SHOUT);
-            uiDemoralizingShoutTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiDemoralizingShoutTimer -= diff;
 
         if (uiWhirlwind1Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND1);
-            uiWhirlwind1Timer = urand(6*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiWhirlwind1Timer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiEnrageTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ENRAGE);
-            uiEnrageTimer = urand(10*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS);
         }else uiEnrageTimer -= diff;
 
 
@@ -159,7 +159,7 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
         {
             if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 EnterEvadeMode();
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 42e87b14a8c..bfc0e418334 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -51,8 +51,8 @@ struct mob_water_elementalAI : public ScriptedAI
 
     void Reset()
     {
-        uiWaterBoltTimer            = 3*IN_MILISECONDS;
-        uiResetTimer                = 5*IN_MILISECONDS;
+        uiWaterBoltTimer            = 3*IN_MILLISECONDS;
+        uiResetTimer                = 5*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -63,7 +63,7 @@ struct mob_water_elementalAI : public ScriptedAI
         if (uiWaterBoltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_WATERBOLT);
-            uiWaterBoltTimer = 5*IN_MILISECONDS;
+            uiWaterBoltTimer = 5*IN_MILLISECONDS;
         } else uiWaterBoltTimer -= diff;
 
         // check if creature is not outside of building
@@ -72,7 +72,7 @@ struct mob_water_elementalAI : public ScriptedAI
             if (Creature *pBalinda = Unit::GetCreature(*me, uiBalindaGUID))
                 if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50)
                     EnterEvadeMode();
-                uiResetTimer = 5*IN_MILISECONDS;
+                uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -94,11 +94,11 @@ struct boss_balindaAI : public ScriptedAI
 
     void Reset()
     {
-        uiArcaneExplosionTimer      = urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
-        uiConeOfColdTimer           = 8*IN_MILISECONDS;
-        uiFireBoltTimer             = 1*IN_MILISECONDS;
-        uiFrostboltTimer            = 4*IN_MILISECONDS;
-        uiResetTimer                = 5*IN_MILISECONDS;
+        uiArcaneExplosionTimer      = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
+        uiConeOfColdTimer           = 8*IN_MILLISECONDS;
+        uiFireBoltTimer             = 1*IN_MILLISECONDS;
+        uiFrostboltTimer            = 4*IN_MILLISECONDS;
+        uiResetTimer                = 5*IN_MILLISECONDS;
         uiWaterElementalTimer       = 0;
 
         Summons.DespawnAll();
@@ -135,32 +135,32 @@ struct boss_balindaAI : public ScriptedAI
         if (uiWaterElementalTimer < diff)
         {
             if (Summons.empty())
-                me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45*IN_MILISECONDS);
-            uiWaterElementalTimer = 50*IN_MILISECONDS;
+                me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45*IN_MILLISECONDS);
+            uiWaterElementalTimer = 50*IN_MILLISECONDS;
         } else uiWaterElementalTimer -= diff;
 
         if (uiArcaneExplosionTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION);
-            uiArcaneExplosionTimer =  urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiArcaneExplosionTimer =  urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiArcaneExplosionTimer -= diff;
 
         if (uiConeOfColdTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_CONE_OF_COLD);
-            uiConeOfColdTimer = urand(10*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiConeOfColdTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiConeOfColdTimer -= diff;
 
         if (uiFireBoltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_FIREBALL);
-            uiFireBoltTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
+            uiFireBoltTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
         } else uiFireBoltTimer -= diff;
 
         if (uiFrostboltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_FROSTBOLT);
-            uiFrostboltTimer = urand(4*IN_MILISECONDS,12*IN_MILISECONDS);
+            uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS);
         } else uiFrostboltTimer -= diff;
 
 
@@ -172,7 +172,7 @@ struct boss_balindaAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 60e26972574..5488a85af87 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -54,12 +54,12 @@ struct boss_drektharAI : public ScriptedAI
 
     void Reset()
     {
-        uiWhirlwindTimer = urand(1*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiWhirlwind2Timer = urand(1*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiKnockdownTimer = 12*IN_MILISECONDS;
-        uiFrenzyTimer = 6*IN_MILISECONDS;
-        uiResetTimer = 5*IN_MILISECONDS;
-        uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+        uiWhirlwindTimer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiWhirlwind2Timer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiKnockdownTimer = 12*IN_MILLISECONDS;
+        uiFrenzyTimer = 6*IN_MILLISECONDS;
+        uiResetTimer = 5*IN_MILLISECONDS;
+        uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
     }
 
     void Aggro(Unit * /*who*/)
@@ -81,31 +81,31 @@ struct boss_drektharAI : public ScriptedAI
         if (uiWhirlwindTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND);
-            uiWhirlwindTimer =  urand(8*IN_MILISECONDS,18*IN_MILISECONDS);
+            uiWhirlwindTimer =  urand(8*IN_MILLISECONDS,18*IN_MILLISECONDS);
         } else uiWhirlwindTimer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(7*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiKnockdownTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_KNOCKDOWN);
-            uiKnockdownTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiKnockdownTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiKnockdownTimer -= diff;
 
         if (uiFrenzyTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_FRENZY);
-            uiFrenzyTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiFrenzyTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiFrenzyTimer -= diff;
 
         if (uiYellTimer <= diff)
         {
             DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5), me);
-            uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+            uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
         } else uiYellTimer -= diff;
 
         // check if creature is not outside of building
@@ -116,7 +116,7 @@ struct boss_drektharAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 8f27fe61810..2c30c7c16b4 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -47,12 +47,12 @@ struct boss_galvangarAI : public ScriptedAI
 
     void Reset()
     {
-        uiCleaveTimer                     = urand(1*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiFrighteningShoutTimer           = urand(2*IN_MILISECONDS,19*IN_MILISECONDS);
-        uiWhirlwind1Timer                 = urand(1*IN_MILISECONDS,13*IN_MILISECONDS);
-        uiWhirlwind2Timer                 = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiMortalStrikeTimer               = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiResetTimer                      = 5*IN_MILISECONDS;
+        uiCleaveTimer                     = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiFrighteningShoutTimer           = urand(2*IN_MILLISECONDS,19*IN_MILLISECONDS);
+        uiWhirlwind1Timer                 = urand(1*IN_MILLISECONDS,13*IN_MILLISECONDS);
+        uiWhirlwind2Timer                 = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiMortalStrikeTimer               = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiResetTimer                      = 5*IN_MILLISECONDS;
     }
 
     void Aggro(Unit * /*who*/)
@@ -73,31 +73,31 @@ struct boss_galvangarAI : public ScriptedAI
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE);
-            uiCleaveTimer =  urand(10*IN_MILISECONDS,16*IN_MILISECONDS);
+            uiCleaveTimer =  urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS);
         } else uiCleaveTimer -= diff;
 
         if (uiFrighteningShoutTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT);
-            uiFrighteningShoutTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiFrighteningShoutTimer -= diff;
 
         if (uiWhirlwind1Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND1);
-            uiWhirlwind1Timer = urand(6*IN_MILISECONDS,10*IN_MILISECONDS);
+            uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,10*IN_MILLISECONDS);
         } else uiWhirlwind1Timer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiMortalStrikeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
-            uiMortalStrikeTimer = urand(10*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiMortalStrikeTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiMortalStrikeTimer -= diff;
 
         // check if creature is not outside of building
@@ -108,7 +108,7 @@ struct boss_galvangarAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index f24d6eec5a9..cb01944b998 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -53,11 +53,11 @@ struct boss_vanndarAI : public ScriptedAI
 
     void Reset()
     {
-        uiAvatarTimer = 3*IN_MILISECONDS;
-        uiThunderclapTimer = 4*IN_MILISECONDS;
-        uiStormboltTimer = 6*IN_MILISECONDS;
-        uiResetTimer = 5*IN_MILISECONDS;
-        uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiAvatarTimer = 3*IN_MILLISECONDS;
+        uiThunderclapTimer = 4*IN_MILLISECONDS;
+        uiStormboltTimer = 6*IN_MILLISECONDS;
+        uiResetTimer = 5*IN_MILLISECONDS;
+        uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
     void Aggro(Unit * /*who*/)
@@ -79,25 +79,25 @@ struct boss_vanndarAI : public ScriptedAI
         if (uiAvatarTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_AVATAR);
-            uiAvatarTimer =  urand(15*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiAvatarTimer =  urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiAvatarTimer -= diff;
 
         if (uiThunderclapTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_THUNDERCLAP);
-            uiThunderclapTimer = urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiThunderclapTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiThunderclapTimer -= diff;
 
         if (uiStormboltTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_STORMBOLT);
-            uiStormboltTimer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiStormboltTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiStormboltTimer -= diff;
 
         if (uiYellTimer <= diff)
         {
             DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5,YELL_RANDOM6,YELL_RANDOM7), me);
-            uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+            uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
         } else uiYellTimer -= diff;
 
         // check if creature is not outside of building
@@ -108,7 +108,7 @@ struct boss_vanndarAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
index a0508c1d86e..86de9f60920 100755
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
@@ -56,7 +56,7 @@ bool GOHello_rookey_egg(Player *pPlayer, GameObject * /*pGO*/)
 {
     Position pos;
     pPlayer->GetPosition(&pos);
-    pPlayer->SummonCreature(NPC_ROOKERY_WHELP, pos, TEMPSUMMON_TIMED_DESPAWN, 15*IN_MILISECONDS);
+    pPlayer->SummonCreature(NPC_ROOKERY_WHELP, pos, TEMPSUMMON_TIMED_DESPAWN, 15*IN_MILLISECONDS);
     //destroy gobject need to be implemented
 
     return true;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
index 208843e359e..53f2b730a80 100755
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -35,7 +35,7 @@ struct instance_blackrock_spire : public ScriptedInstance
 
     void Initialize()
     {
-      uiLeeroyTimer = 15*IN_MILISECONDS;
+      uiLeeroyTimer = 15*IN_MILLISECONDS;
       uiWhelpCount = 0;
       bLeeeeeeeeroy = true;
       uiLeroyData = 0;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index c5bc8a2a3d4..6498e48069a 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -94,7 +94,7 @@ void SummonCroneIfReady(ScriptedInstance* pInstance, Creature* pCreature)
 
     if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
     {
-        if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+        if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
         {
             if (pCreature->getVictim())
                 pCrone->AI()->AttackStart(pCreature->getVictim());
@@ -727,7 +727,7 @@ bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 /
 {
     if (uiAction == GOSSIP_ACTION_INFO_DEF)
     {
-        if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+        if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             pBigBadWolf->AI()->AttackStart(pPlayer);
 
         pCreature->ForcedDespawn();
@@ -1285,7 +1285,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
     {
         if (SummonRomuloTimer <= diff)
         {
-            if (Creature* pRomulo = me->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+            if (Creature* pRomulo = me->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             {
                 RomuloGUID = pRomulo->GetGUID();
                 CAST_AI(boss_romuloAI, pRomulo->AI())->JulianneGUID = me->GetGUID();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index bf9c2519dd9..29e22d36047 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -247,7 +247,7 @@ struct npc_barnesAI : public npc_escortAI
             uint32 entry = ((uint32)Spawns[index][0]);
             float PosX = Spawns[index][1];
 
-            if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+            if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             {
                 // In case database has bad flags
                 pCreature->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index d23c7883f96..f6f1631fa6a 100755
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -72,7 +72,7 @@ struct npc_kalecgosAI : public ScriptedAI
             return;
 
         if (uiPointId == POINT_ID_LAND)
-            m_uiTransformTimer = MINUTE*IN_MILISECONDS;
+            m_uiTransformTimer = MINUTE*IN_MILLISECONDS;
     }
 
     // some targeting issues with the spell, so use this workaround as temporary solution
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index 1665d8356b9..5ad9768d567 100755
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -55,9 +55,9 @@ struct boss_golemaggAI : public ScriptedAI
 
     void Reset()
     {
-        m_uiPyroblastTimer = 7*IN_MILISECONDS;              // These timers are probably wrong
-        m_uiEarthquakeTimer = 3*IN_MILISECONDS;
-        m_uiBuffTimer = 2.5*IN_MILISECONDS;
+        m_uiPyroblastTimer = 7*IN_MILLISECONDS;              // These timers are probably wrong
+        m_uiEarthquakeTimer = 3*IN_MILLISECONDS;
+        m_uiBuffTimer = 2.5*IN_MILLISECONDS;
         m_bEnraged = false;
 
         DoCast(me, SPELL_MAGMASPLASH, true);
@@ -80,7 +80,7 @@ struct boss_golemaggAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_PYROBLAST);
 
-            m_uiPyroblastTimer = 7*IN_MILISECONDS;
+            m_uiPyroblastTimer = 7*IN_MILLISECONDS;
         }
         else
             m_uiPyroblastTimer -= uiDiff;
@@ -98,7 +98,7 @@ struct boss_golemaggAI : public ScriptedAI
             if (m_uiEarthquakeTimer <= uiDiff)
             {
                 DoCast(me->getVictim(), SPELL_EARTHQUAKE);
-                m_uiEarthquakeTimer = 3*IN_MILISECONDS;
+                m_uiEarthquakeTimer = 3*IN_MILLISECONDS;
             }
             else
                 m_uiEarthquakeTimer -= uiDiff;
@@ -109,7 +109,7 @@ struct boss_golemaggAI : public ScriptedAI
         if (m_uiBuffTimer <= uidiff)
         {
             DoCast(me, SPELL_GOLEMAGG_TRUST);
-            m_uiBuffTimer = 2.5*IN_MILISECONDS;
+            m_uiBuffTimer = 2.5*IN_MILLISECONDS;
         }
         else
             m_uiBuffTimer -= uiDiff;
@@ -132,7 +132,7 @@ struct mob_core_ragerAI : public ScriptedAI
 
     void Reset()
     {
-        m_uiMangleTimer = 7*IN_MILISECONDS;                 // These times are probably wrong
+        m_uiMangleTimer = 7*IN_MILLISECONDS;                 // These times are probably wrong
     }
 
     void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage)
@@ -164,7 +164,7 @@ struct mob_core_ragerAI : public ScriptedAI
         if (m_uiMangleTimer <= uiDiff)
         {
             DoCast(me->getVictim(), SPELL_MANGLE);
-            m_uiMangleTimer = 10*IN_MILISECONDS;
+            m_uiMangleTimer = 10*IN_MILLISECONDS;
         }
         else
             m_uiMangleTimer -= uiDiff;
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index 5f1e1a0f088..ec2fd370a16 100755
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -102,7 +102,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI
         for (uint8 i=0; i<uiCount; ++i)
             me->SummonCreature(NPC_ZOMBIE,
             m_aSummonPoint[i].m_fX, m_aSummonPoint[i].m_fY, m_aSummonPoint[i].m_fZ, m_aSummonPoint[i].m_fOrient,
-            TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILISECONDS);
+            TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS);
     }
 
     void EnterCombat(Unit * /*who*/)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index bf45480783e..2be5b6caacb 100755
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -96,7 +96,7 @@ struct boss_akilzonAI : public ScriptedAI
         GustOfWind_Timer = urand(20000,30000); //20 to 30 seconds(bosskillers)
         CallLighting_Timer = urand(10000,20000); //totaly random timer. can't find any info on this
         ElectricalStorm_Timer = 60000; //60 seconds(bosskillers)
-        Enrage_Timer = 10*MINUTE*IN_MILISECONDS; //10 minutes till enrage(bosskillers)
+        Enrage_Timer = 10*MINUTE*IN_MILLISECONDS; //10 minutes till enrage(bosskillers)
         SummonEagles_Timer = 99999;
 
         TargetGUID = 0;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index ffa963fdb04..073fff60456 100755
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -143,7 +143,7 @@ struct boss_janalaiAI : public ScriptedAI
         BombSequenceTimer = 1000;
         BombCount = 0;
         HatcherTimer = 10000;
-        EnrageTimer = MINUTE*5*IN_MILISECONDS;
+        EnrageTimer = MINUTE*5*IN_MILLISECONDS;
 
         noeggs = false;
         isBombing =false;
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 8de463d4afc..36a2712fe6d 100755
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -137,7 +137,7 @@ struct instance_onyxias_lair : public ScriptedInstance
                 {
                     m_bAchievManyWhelpsHandleIt = false;
                     m_uiManyWhelpsCounter = 0;
-                    m_uiOnyxiaLiftoffTimer = 10*IN_MILISECONDS;
+                    m_uiOnyxiaLiftoffTimer = 10*IN_MILLISECONDS;
                 }
                 break;
             case DATA_SHE_DEEP_BREATH_MORE:
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index a428cc6a856..65c649c4225 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -117,10 +117,10 @@ struct boss_anub_arakAI : public ScriptedAI
 
     void Reset()
     {
-        uiCarrionBeetlesTimer = 8*IN_MILISECONDS;
-        uiLeechingSwarmTimer = 20*IN_MILISECONDS;
-        uiImpaleTimer = 9*IN_MILISECONDS;
-        uiPoundTimer = 15*IN_MILISECONDS;
+        uiCarrionBeetlesTimer = 8*IN_MILLISECONDS;
+        uiLeechingSwarmTimer = 20*IN_MILLISECONDS;
+        uiImpaleTimer = 9*IN_MILLISECONDS;
+        uiPoundTimer = 15*IN_MILLISECONDS;
 
         uiPhase = PHASE_MELEE;
         uiUndergroundPhase = 0;
@@ -144,7 +144,7 @@ struct boss_anub_arakAI : public ScriptedAI
         Position targetPos;
         pTarget->GetPosition(&targetPos);
 
-        if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILISECONDS))
+        if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILLISECONDS))
         {
             uiImpaleTarget = pImpaleTarget->GetGUID();
             pImpaleTarget->SetReactState(REACT_PASSIVE);
@@ -183,7 +183,7 @@ struct boss_anub_arakAI : public ScriptedAI
                     {
                         if (Creature *pImpaleTarget = DoSummonImpaleTarget(target))
                             pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true);
-                        uiImpaleTimer = 3*IN_MILISECONDS;
+                        uiImpaleTimer = 3*IN_MILLISECONDS;
                         uiImpalePhase = IMPALE_PHASE_ATTACK;
                     }
                     break;
@@ -194,13 +194,13 @@ struct boss_anub_arakAI : public ScriptedAI
                         pImpaleTarget->RemoveAurasDueToSpell(SPELL_IMPALE_SHAKEGROUND);
                     }
                     uiImpalePhase = IMPALE_PHASE_DMG;
-                    uiImpaleTimer = 1*IN_MILISECONDS;
+                    uiImpaleTimer = 1*IN_MILLISECONDS;
                     break;
                 case IMPALE_PHASE_DMG:
                     if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget))
                         me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_IMPALE_DMG, SPELL_IMPALE_DMG_H), true);
                     uiImpalePhase = IMPALE_PHASE_TARGET;
-                    uiImpaleTimer = 9*IN_MILISECONDS;
+                    uiImpaleTimer = 9*IN_MILLISECONDS;
                     break;
                 }
             } else uiImpaleTimer -= diff;
@@ -274,12 +274,12 @@ struct boss_anub_arakAI : public ScriptedAI
                 bVenomancerSummoned = false;
                 bDatterSummoned = false;
 
-                uiUndergroundTimer = 40*IN_MILISECONDS;
-                uiVenomancerTimer = 25*IN_MILISECONDS;
-                uiDatterTimer = 32*IN_MILISECONDS;
+                uiUndergroundTimer = 40*IN_MILLISECONDS;
+                uiVenomancerTimer = 25*IN_MILLISECONDS;
+                uiDatterTimer = 32*IN_MILLISECONDS;
 
                 uiImpalePhase = 0;
-                uiImpaleTimer = 9*IN_MILISECONDS;
+                uiImpaleTimer = 9*IN_MILLISECONDS;
 
                 DoCast(me, SPELL_SUBMERGE, false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
@@ -298,13 +298,13 @@ struct boss_anub_arakAI : public ScriptedAI
             {
                 bChanneling = true;
                 DoCastVictim(SPELL_CARRION_BEETLES);
-                uiCarrionBeetlesTimer = 25*IN_MILISECONDS;
+                uiCarrionBeetlesTimer = 25*IN_MILLISECONDS;
             } else uiCarrionBeetlesTimer -= diff;
             
             if (uiLeechingSwarmTimer <= diff)
             {
                 DoCast(me, SPELL_LEECHING_SWARM, true);
-                uiLeechingSwarmTimer = 19*IN_MILISECONDS;
+                uiLeechingSwarmTimer = 19*IN_MILLISECONDS;
             } else uiLeechingSwarmTimer -= diff;
 
             if (uiPoundTimer <= diff)
@@ -314,7 +314,7 @@ struct boss_anub_arakAI : public ScriptedAI
                     if (Creature *pImpaleTarget = DoSummonImpaleTarget(target))
                         me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false);
                 }
-                uiPoundTimer = 16.5*IN_MILISECONDS;
+                uiPoundTimer = 16.5*IN_MILLISECONDS;
             } else uiPoundTimer -= diff;
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 088b39bce03..7b8a81013be 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -71,12 +71,12 @@ struct boss_hadronoxAI : public ScriptedAI
         me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f);
         me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f);
 
-        uiAcidTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS);
-        uiLeechTimer = urand(3*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiPierceTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS);
-        uiGrabTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS);
-        uiDoorsTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
-        uiCheckDistanceTimer = 2*IN_MILISECONDS;
+        uiAcidTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS);
+        uiLeechTimer = urand(3*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiPierceTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS);
+        uiGrabTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS);
+        uiDoorsTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
+        uiCheckDistanceTimer = 2*IN_MILLISECONDS;
 
         if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime))
             pInstance->SetData(DATA_HADRONOX_EVENT, FAIL);
@@ -121,7 +121,7 @@ struct boss_hadronoxAI : public ScriptedAI
         me->GetRespawnCoord(x,y,z);
 
         if (uiCheckDistanceTimer <= uiDiff)
-            uiCheckDistanceTimer = 5*IN_MILISECONDS;
+            uiCheckDistanceTimer = 5*IN_MILLISECONDS;
         else
         {
             uiCheckDistanceTimer -= uiDiff;
@@ -152,7 +152,7 @@ struct boss_hadronoxAI : public ScriptedAI
         if (uiPierceTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_PIERCE_ARMOR);
-            uiPierceTimer = 8*IN_MILISECONDS;
+            uiPierceTimer = 8*IN_MILLISECONDS;
         } else uiPierceTimer -= diff;
 
         if (uiAcidTimer <= diff)
@@ -160,7 +160,7 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_ACID_CLOUD);
 
-            uiAcidTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiAcidTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiAcidTimer -= diff;
 
         if (uiLeechTimer <= diff)
@@ -168,7 +168,7 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_LEECH_POISON);
 
-            uiLeechTimer = urand(11*IN_MILISECONDS,14*IN_MILISECONDS);
+            uiLeechTimer = urand(11*IN_MILLISECONDS,14*IN_MILLISECONDS);
         } else uiLeechTimer -= diff;
 
         if (uiGrabTimer <= diff)
@@ -176,13 +176,13 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself.
                 DoCast(pTarget, SPELL_WEB_GRAB);
 
-            uiGrabTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiGrabTimer -= diff;
 
         if (uiDoorsTimer <= diff)
         {
             //DoCast(me, RAND(SPELL_WEB_FRONT_DOORS, SPELL_WEB_SIDE_DOORS));
-            uiDoorsTimer = urand(30*IN_MILISECONDS,60*IN_MILISECONDS);
+            uiDoorsTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS);
         } else uiDoorsTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 96707cead16..9680863acad 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -106,8 +106,8 @@ struct boss_krik_thirAI : public ScriptedAI
 
     void Reset()
     {
-        uiMindFlayTimer = 15*IN_MILISECONDS;
-        uiCurseFatigueTimer = 12*IN_MILISECONDS;
+        uiMindFlayTimer = 15*IN_MILLISECONDS;
+        uiCurseFatigueTimer = 12*IN_MILLISECONDS;
 
         if (pInstance)
             pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED);
@@ -117,7 +117,7 @@ struct boss_krik_thirAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, me);
         Summon();
-        uiSummonTimer = 15*IN_MILISECONDS;
+        uiSummonTimer = 15*IN_MILLISECONDS;
 
         if (pInstance)
             pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS);
@@ -125,22 +125,22 @@ struct boss_krik_thirAI : public ScriptedAI
 
     void Summon()
     {
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
     }
 
     void UpdateAI(const uint32 diff)
@@ -151,13 +151,13 @@ struct boss_krik_thirAI : public ScriptedAI
         if (uiSummonTimer <= diff)
         {
             Summon();
-            uiSummonTimer = 15*IN_MILISECONDS;
+            uiSummonTimer = 15*IN_MILLISECONDS;
         } else uiSummonTimer -= diff;
 
         if (uiMindFlayTimer <= diff)
         {
                 DoCast(me->getVictim(), SPELL_MIND_FLAY);
-                uiMindFlayTimer = 15*IN_MILISECONDS;
+                uiMindFlayTimer = 15*IN_MILLISECONDS;
             } else uiMindFlayTimer -= diff;
 
         if (uiCurseFatigueTimer <= diff)
@@ -169,7 +169,7 @@ struct boss_krik_thirAI : public ScriptedAI
             DoCast(pTarget, SPELL_CURSE_OF_FATIGUE);
             DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE);
 
-            uiCurseFatigueTimer = 10*IN_MILISECONDS;
+            uiCurseFatigueTimer = 10*IN_MILLISECONDS;
         } else uiCurseFatigueTimer -= diff;
 
         if (!me->HasAura(SPELL_FRENZY) && HealthBelowPct(10))
@@ -236,8 +236,8 @@ struct npc_anub_ar_skirmisherAI : public ScriptedAI
 
     void Reset()
     {
-        uiChargeTimer   = 11*IN_MILISECONDS;
-        uiBackstabTimer = 7*IN_MILISECONDS;
+        uiChargeTimer   = 11*IN_MILLISECONDS;
+        uiBackstabTimer = 7*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -253,13 +253,13 @@ struct npc_anub_ar_skirmisherAI : public ScriptedAI
                 me->AddThreat(pTarget,1.0f);
                 DoCast(pTarget, SPELL_CHARGE, true);
             }
-            uiChargeTimer = 15*IN_MILISECONDS;
+            uiChargeTimer = 15*IN_MILLISECONDS;
         } else uiChargeTimer -= diff;
 
         if (uiBackstabTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BACKSTAB);
-            uiBackstabTimer = 12*IN_MILISECONDS;
+            uiBackstabTimer = 12*IN_MILLISECONDS;
         } else uiBackstabTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -276,8 +276,8 @@ struct npc_anub_ar_shadowcasterAI : public ScriptedAI
 
     void Reset()
     {
-        uiShadowBoltTimer = 6*IN_MILISECONDS;
-        uiShadowNovaTimer = 15*IN_MILISECONDS;
+        uiShadowBoltTimer = 6*IN_MILLISECONDS;
+        uiShadowNovaTimer = 15*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -289,13 +289,13 @@ struct npc_anub_ar_shadowcasterAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                  DoCast(pTarget, SPELL_SHADOW_BOLT, true);
-            uiShadowBoltTimer = 15*IN_MILISECONDS;
+            uiShadowBoltTimer = 15*IN_MILLISECONDS;
         } else uiShadowBoltTimer -= diff;
 
         if (uiShadowNovaTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true);
-            uiShadowNovaTimer = 17*IN_MILISECONDS;
+            uiShadowNovaTimer = 17*IN_MILLISECONDS;
         } else uiShadowNovaTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -311,8 +311,8 @@ struct npc_anub_ar_warriorAI : public ScriptedAI
 
     void Reset()
     {
-        uiCleaveTimer = 11*IN_MILISECONDS;
-        uiStrikeTimer = 6*IN_MILISECONDS;
+        uiCleaveTimer = 11*IN_MILLISECONDS;
+        uiStrikeTimer = 6*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -323,13 +323,13 @@ struct npc_anub_ar_warriorAI : public ScriptedAI
         if (uiStrikeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_STRIKE, true);
-            uiStrikeTimer = 15*IN_MILISECONDS;
+            uiStrikeTimer = 15*IN_MILLISECONDS;
         } else uiStrikeTimer -= diff;
 
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE, true);
-            uiCleaveTimer = 17*IN_MILISECONDS;
+            uiCleaveTimer = 17*IN_MILLISECONDS;
         } else uiCleaveTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -347,8 +347,8 @@ struct npc_watcher_gashraAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -365,13 +365,13 @@ struct npc_watcher_gashraAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
-            uiWebWrapTimer = 17*IN_MILISECONDS;
+            uiWebWrapTimer = 17*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 15*IN_MILISECONDS;
+            uiInfectedBiteTimer = 15*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -388,9 +388,9 @@ struct npc_watcher_narjilAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
-        uiBindingWebsTimer = 17*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
+        uiBindingWebsTimer = 17*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -402,19 +402,19 @@ struct npc_watcher_narjilAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
-            uiWebWrapTimer = 15*IN_MILISECONDS;
+            uiWebWrapTimer = 15*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 11*IN_MILISECONDS;
+            uiInfectedBiteTimer = 11*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         if (uiBindingWebsTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true);
-            uiBindingWebsTimer = 17*IN_MILISECONDS;
+            uiBindingWebsTimer = 17*IN_MILLISECONDS;
         } else uiBindingWebsTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -431,9 +431,9 @@ struct npc_watcher_silthikAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
-        uiPoisonSprayTimer  = 15*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
+        uiPoisonSprayTimer  = 15*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -446,19 +446,19 @@ struct npc_watcher_silthikAI : public ScriptedAI
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
 
-            uiWebWrapTimer = 15*IN_MILISECONDS;
+            uiWebWrapTimer = 15*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 15*IN_MILISECONDS;
+            uiInfectedBiteTimer = 15*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         if (uiPoisonSprayTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POSION_SPRAY, true);
-            uiPoisonSprayTimer = 17*IN_MILISECONDS;
+            uiPoisonSprayTimer = 17*IN_MILLISECONDS;
         } else uiPoisonSprayTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
index c1c4427a63c..ee5dc6b297f 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
@@ -60,9 +60,9 @@ struct boss_amanitarAI : public ScriptedAI
 
     void Reset()
     {
-        uiRootTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiBashTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS);
-        uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiRootTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiBashTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS);
+        uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         uiSpawnTimer = 0;
 
         me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
@@ -106,9 +106,9 @@ struct boss_amanitarAI : public ScriptedAI
                 Position pos;
                 victim->GetPosition(&pos);
                 me->GetRandomNearPosition(pos, float(urand(5,80)));
-                me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILISECONDS);
+                me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS);
                 me->GetRandomNearPosition(pos, float(urand(5,80)));
-                me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILISECONDS);
+                me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS);
             }
         }
     }
@@ -122,27 +122,27 @@ struct boss_amanitarAI : public ScriptedAI
         if (uiSpawnTimer <= diff)
         {
             SpawnAdds();
-            uiSpawnTimer = urand(35*IN_MILISECONDS,40*IN_MILISECONDS);
+            uiSpawnTimer = urand(35*IN_MILLISECONDS,40*IN_MILLISECONDS);
         } else uiSpawnTimer -= diff;
 
         if (uiRootTimer <= diff)
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_ENTANGLING_ROOTS);
-            uiRootTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiRootTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiRootTimer -= diff;
 
         if (uiBashTimer <= diff)
         {
             DoCastVictim(SPELL_BASH);
-            uiBashTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiBashTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiBashTimer -= diff;
 
         if (uiBoltTimer <= diff)
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY);
-            uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiBoltTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -164,7 +164,7 @@ struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
             DoCast(me, SPELL_POISONOUS_MUSHROOM_VISUAL_AURA, true);
 
         uiAuraTimer = 0;
-        uiDeathTimer = 30*IN_MILISECONDS;
+        uiDeathTimer = 30*IN_MILLISECONDS;
     }
 
     void JustDied(Unit *killer)
@@ -190,7 +190,7 @@ struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
             {
                 DoCast(me, SPELL_POISONOUS_MUSHROOM_VISUAL_AREA, true);
                 DoCast(me, SPELL_POISONOUS_MUSHROOM_POISON_CLOUD, false);
-                uiAuraTimer = 7*IN_MILISECONDS;
+                uiAuraTimer = 7*IN_MILLISECONDS;
             } else uiAuraTimer -= diff;
         }
         if (uiDeathTimer <= diff)
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
index b25b62573d4..05c868708f2 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
@@ -75,13 +75,13 @@ struct boss_elder_nadoxAI : public ScriptedAI
 
     void Reset()
     {
-        uiPlagueTimer = 13*IN_MILISECONDS;
-        uiRagueTimer = 20*IN_MILISECONDS;
+        uiPlagueTimer = 13*IN_MILLISECONDS;
+        uiRagueTimer = 20*IN_MILLISECONDS;
 
-        uiSwarmerSpawnTimer = 10*IN_MILISECONDS;
-        uiGuardSpawnTimer = 25*IN_MILISECONDS;
+        uiSwarmerSpawnTimer = 10*IN_MILLISECONDS;
+        uiGuardSpawnTimer = 25*IN_MILLISECONDS;
 
-        uiEnragueTimer = 5*IN_MILISECONDS;
+        uiEnragueTimer = 5*IN_MILLISECONDS;
 
         DeadAhnkaharGuardian = false;
         bGuardSpawned = false;
@@ -123,7 +123,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
         if (uiPlagueTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BROOD_PLAGUE);
-            uiPlagueTimer = 15*IN_MILISECONDS;
+            uiPlagueTimer = 15*IN_MILLISECONDS;
         } else uiPlagueTimer -= diff;
 
         if (IsHeroic())
@@ -132,7 +132,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
                 if (Creature *pSwarmer = me->FindNearestCreature(MOB_AHNKAHAR_SWARMER, 35))
                 {
                     DoCast(pSwarmer, H_SPELL_BROOD_RAGE, true);
-                    uiRagueTimer = 15*IN_MILISECONDS;
+                    uiRagueTimer = 15*IN_MILLISECONDS;
                 }
             } else uiRagueTimer -= diff;
 
@@ -143,7 +143,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
             if (urand(1,3) == 3) // 33% chance of dialog
                 DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), me);
 
-            uiSwarmerSpawnTimer = 10*IN_MILISECONDS;
+            uiSwarmerSpawnTimer = 10*IN_MILLISECONDS;
         } else uiSwarmerSpawnTimer -= diff;
 
         if (!bGuardSpawned && uiGuardSpawnTimer <= diff)
@@ -164,7 +164,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
                 if (!me->IsNonMeleeSpellCasted(false))
                     DoCast(me, SPELL_ENRAGE, true);
 
-            uiEnragueTimer = 5*IN_MILISECONDS;
+            uiEnragueTimer = 5*IN_MILLISECONDS;
         } else uiEnragueTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -196,7 +196,7 @@ struct mob_ahnkahar_nerubianAI : public ScriptedAI
     {
         if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) //magic numbers are bad!
             DoCast(me, SPELL_GUARDIAN_AURA, true);
-        uiSprintTimer = 10*IN_MILISECONDS;
+        uiSprintTimer = 10*IN_MILLISECONDS;
     }
 
     void JustDied(Unit * /*killer*/)
@@ -229,7 +229,7 @@ struct mob_ahnkahar_nerubianAI : public ScriptedAI
         if (uiSprintTimer <= diff)
         {
             DoCast(me, SPELL_SPRINT);
-            uiSprintTimer = 25*IN_MILISECONDS;
+            uiSprintTimer = 25*IN_MILLISECONDS;
         } else uiSprintTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
index f020e16cb96..0e58217c584 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
@@ -146,9 +146,9 @@ struct boss_volazjAI : public ScriptedAI
 
     void Reset()
     {
-        uiMindFlayTimer = 8*IN_MILISECONDS;
-        uiShadowBoltVolleyTimer = 5*IN_MILISECONDS;
-        uiShiverTimer = 15*IN_MILISECONDS;
+        uiMindFlayTimer = 8*IN_MILLISECONDS;
+        uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS;
+        uiShiverTimer = 15*IN_MILLISECONDS;
 
         if (pInstance)
         {
@@ -272,20 +272,20 @@ struct boss_volazjAI : public ScriptedAI
         if (uiMindFlayTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MIND_FLAY);
-            uiMindFlayTimer = 20*IN_MILISECONDS;
+            uiMindFlayTimer = 20*IN_MILLISECONDS;
         } else uiMindFlayTimer -= diff;
 
         if (uiShadowBoltVolleyTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY);
-            uiShadowBoltVolleyTimer = 5*IN_MILISECONDS;
+            uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS;
         } else uiShadowBoltVolleyTimer -= diff;
 
         if (uiShiverTimer <= diff)
         {
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_SHIVER);
-            uiShiverTimer = 15*IN_MILISECONDS;
+            uiShiverTimer = 15*IN_MILLISECONDS;
         } else uiShiverTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 5c39cc122b6..3ea1c0bda4f 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -89,11 +89,11 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
 
     void Reset()
     {
-        uiOpFerTimer = urand(15*IN_MILISECONDS,20*IN_MILISECONDS);
+        uiOpFerTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS);
 
-        uiCycloneTimer = 3*IN_MILISECONDS;
-        uiBoltTimer = 7*IN_MILISECONDS;
-        uiThunderTimer = 12*IN_MILISECONDS;
+        uiCycloneTimer = 3*IN_MILLISECONDS;
+        uiBoltTimer = 7*IN_MILLISECONDS;
+        uiThunderTimer = 12*IN_MILLISECONDS;
 
         bOpFerok = false;
         bOpFerokFail = false;
@@ -247,7 +247,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
         if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen();
 
         bOnGround = false;
-        uiOpFerTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiOpFerTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
     void OpferRufen()
@@ -303,7 +303,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
             if (uiCycloneTimer <= diff)
             {
                 DoCast(me, SPELL_CYCLONE_STRIKE, false);
-                uiCycloneTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiCycloneTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiCycloneTimer -= diff;
 
             if (uiBoltTimer <= diff)
@@ -311,7 +311,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false);
 
-                uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiBoltTimer -= diff;
 
             if (uiThunderTimer <= diff)
@@ -319,7 +319,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false);
 
-                uiThunderTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiThunderTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiThunderTimer -= diff;
 
             if (uiOpFerTimer <= diff)
@@ -351,7 +351,7 @@ struct mob_jedoga_initiandAI : public ScriptedAI
             return;
 
         bWalking = false;
-        bCheckTimer = 2*IN_MILISECONDS;
+        bCheckTimer = 2*IN_MILLISECONDS;
 
         if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
         {
@@ -466,7 +466,7 @@ struct mob_jedoga_initiandAI : public ScriptedAI
                     me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE);
                 }
             }
-            bCheckTimer = 2*IN_MILISECONDS;
+            bCheckTimer = 2*IN_MILLISECONDS;
         } else bCheckTimer -= diff;
 
         //Return since we have no target
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index a3ce654bc76..995fccd8611 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -97,10 +97,10 @@ struct boss_taldaramAI : public ScriptedAI
 
     void Reset()
     {
-        uiBloodthirstTimer = 10*IN_MILISECONDS;
-        uiVanishTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
-        uiEmbraceTimer = 20*IN_MILISECONDS;
-        uiFlamesphereTimer = 5*IN_MILISECONDS;
+        uiBloodthirstTimer = 10*IN_MILLISECONDS;
+        uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
+        uiEmbraceTimer = 20*IN_MILLISECONDS;
+        uiFlamesphereTimer = 5*IN_MILLISECONDS;
         uiEmbraceTakenDamage = 0;
         Phase = NORMAL;
         uiPhaseTimer = 0;
@@ -129,7 +129,7 @@ struct boss_taldaramAI : public ScriptedAI
                     Creature* pSpheres[3];
 
                     //DoCast(me, SPELL_FLAME_SPHERE_SUMMON_1);
-                    pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                    pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                     Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                     if (pSphereTarget && pSpheres[0])
                     {
@@ -142,9 +142,9 @@ struct boss_taldaramAI : public ScriptedAI
                     if (IsHeroic())
                     {
                         //DoCast(me, H_SPELL_FLAME_SPHERE_SUMMON_1);
-                        pSpheres[1] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_1, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                        pSpheres[1] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_1, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                         //DoCast(me, H_SPELL_FLAME_SPHERE_SUMMON_2);
-                        pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                        pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                         if (pSphereTarget && pSpheres[1] && pSpheres[2])
                         {
                             float angle,x,y;
@@ -180,7 +180,7 @@ struct boss_taldaramAI : public ScriptedAI
                     me->SetSpeed(MOVE_WALK, 1.0f, true);
                     me->GetMotionMaster()->MoveChase(me->getVictim());
                     Phase = FEEDING;
-                    uiPhaseTimer = 20*IN_MILISECONDS;
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
                     break;
                 case FEEDING:
                     Phase = NORMAL;
@@ -191,15 +191,15 @@ struct boss_taldaramAI : public ScriptedAI
                     if (uiBloodthirstTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_BLOODTHIRST);
-                        uiBloodthirstTimer = 10*IN_MILISECONDS;
+                        uiBloodthirstTimer = 10*IN_MILLISECONDS;
                     } else uiBloodthirstTimer -= diff;
 
                     if (uiFlamesphereTimer <= diff)
                     {
                         DoCast(me, SPELL_CONJURE_FLAME_SPHERE);
                         Phase = CASTING_FLAME_SPHERES;
-                        uiPhaseTimer = 3*IN_MILISECONDS + diff;
-                        uiFlamesphereTimer = 15*IN_MILISECONDS;
+                        uiPhaseTimer = 3*IN_MILLISECONDS + diff;
+                        uiFlamesphereTimer = 15*IN_MILLISECONDS;
                     } else uiFlamesphereTimer -= diff;
 
                     if (uiVanishTimer <= diff)
@@ -227,7 +227,7 @@ struct boss_taldaramAI : public ScriptedAI
                                 uiEmbraceTarget = pEmbraceTarget->GetGUID();
 
                         }
-                        uiVanishTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
+                        uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
                     } else uiVanishTimer -= diff;
 
                     DoMeleeAttackIfReady();
@@ -338,7 +338,7 @@ struct mob_taldaram_flamesphereAI : public ScriptedAI
         DoCast(me, SPELL_FLAME_SPHERE_VISUAL);
         DoCast(me, SPELL_FLAME_SPHERE_SPAWN_EFFECT);
         DoCast(me, SPELL_FLAME_SPHERE_PERIODIC);
-        uiDespawnTimer = 10*IN_MILISECONDS;
+        uiDespawnTimer = 10*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit * /*who*/) {}
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
index a7f0cdc3a2f..c03d3df15d8 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
@@ -70,12 +70,12 @@ struct boss_dredAI : public ScriptedAI
             pInstance->SetData(DATA_KING_DRED_ACHIEV, 0);
         }
 
-        uiBellowingRoarTimer = 33*IN_MILISECONDS;
-        uiGrievousBiteTimer  = 20*IN_MILISECONDS;
-        uiManglingSlashTimer = 18.5*IN_MILISECONDS;
-        uiFearsomeRoarTimer  = urand(10*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiPiercingSlashTimer = 17*IN_MILISECONDS;
-        uiRaptorCallTimer    = urand(20*IN_MILISECONDS,25*IN_MILISECONDS);
+        uiBellowingRoarTimer = 33*IN_MILLISECONDS;
+        uiGrievousBiteTimer  = 20*IN_MILLISECONDS;
+        uiManglingSlashTimer = 18.5*IN_MILLISECONDS;
+        uiFearsomeRoarTimer  = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiPiercingSlashTimer = 17*IN_MILLISECONDS;
+        uiRaptorCallTimer    = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS);
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -93,31 +93,31 @@ struct boss_dredAI : public ScriptedAI
         if (uiBellowingRoarTimer < diff)
         {
             DoCastAOE(SPELL_BELLOWING_ROAR, false);
-            uiBellowingRoarTimer = 40*IN_MILISECONDS;
+            uiBellowingRoarTimer = 40*IN_MILLISECONDS;
         } else uiBellowingRoarTimer -=diff;
 
         if (uiGrievousBiteTimer < diff)
         {
             DoCastVictim(SPELL_GRIEVOUS_BITE ,false);
-            uiGrievousBiteTimer = 20*IN_MILISECONDS;
+            uiGrievousBiteTimer = 20*IN_MILLISECONDS;
         } else uiGrievousBiteTimer -=diff;
 
         if (uiManglingSlashTimer < diff)
         {
             DoCastVictim(SPELL_MANGLING_SLASH,false);
-            uiManglingSlashTimer = 20*IN_MILISECONDS;
+            uiManglingSlashTimer = 20*IN_MILLISECONDS;
         } else uiManglingSlashTimer -=diff;
 
         if (uiFearsomeRoarTimer < diff)
         {
             DoCastAOE(SPELL_FEARSOME_ROAR,false);
-            uiFearsomeRoarTimer = urand(16*IN_MILISECONDS,18*IN_MILISECONDS);
+            uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS,18*IN_MILLISECONDS);
         } else uiFearsomeRoarTimer -=diff;
 
         if (uiPiercingSlashTimer < diff)
         {
             DoCastVictim(SPELL_PIERCING_SLASH,false);
-            uiPiercingSlashTimer = 20*IN_MILISECONDS;
+            uiPiercingSlashTimer = 20*IN_MILLISECONDS;
         } else uiPiercingSlashTimer -=diff;
 
         if (uiRaptorCallTimer < diff)
@@ -127,9 +127,9 @@ struct boss_dredAI : public ScriptedAI
             float x,y,z;
 
             me->GetClosePoint(x,y,z,me->GetObjectSize()/3,10.0f);
-            me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILISECONDS);
+            me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILLISECONDS);
 
-            uiRaptorCallTimer = urand(20*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiRaptorCallTimer -=diff;
 
         DoMeleeAttackIfReady();
@@ -213,7 +213,7 @@ struct npc_drakkari_scytheclawAI : public ScriptedAI
 
     void Reset()
     {
-        uiRendTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+        uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
     }
 
     void UpdateAI(const uint32 diff)
@@ -225,7 +225,7 @@ struct npc_drakkari_scytheclawAI : public ScriptedAI
         if (uiRendTimer < diff)
         {
             DoCastVictim(SPELL_REND,false);
-            uiRendTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         }else uiRendTimer -=diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index c18b7deb272..e8abb804417 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -117,8 +117,8 @@ struct boss_novosAI : public Scripted_NoMovementAI
     {
         DoScriptText(SAY_AGGRO, me);
         Phase = PHASE_1;
-        uiCrystalHandlerTimer = 30*IN_MILISECONDS;
-        uiTimer = 1*IN_MILISECONDS;
+        uiCrystalHandlerTimer = 30*IN_MILLISECONDS;
+        uiTimer = 1*IN_MILLISECONDS;
         DoCast(SPELL_ARCANE_FIELD);
         if (pInstance)
         {
@@ -141,18 +141,18 @@ struct boss_novosAI : public Scripted_NoMovementAI
             case PHASE_1:
                 if (uiTimer <= diff)
                 {
-                    Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                    Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                     pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint);
                     //If spell is casted stops casting arcane field so no spell casting
                     //DoCast(me, SPELL_SUMMON_MINIONS);
-                    uiTimer = 3*IN_MILISECONDS;
+                    uiTimer = 3*IN_MILLISECONDS;
                 } else uiTimer -= diff;
                 if (uiCrystalHandlerTimer <= diff)
                 {
                     DoScriptText(SAY_NECRO_ADD, me);
-                    Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                    Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                     pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint);
-                    uiCrystalHandlerTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+                    uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
                 } else uiCrystalHandlerTimer -= diff;
                 break;
             case PHASE_2:
@@ -161,7 +161,7 @@ struct boss_novosAI : public Scripted_NoMovementAI
                     if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST,SPELL_BLIZZARD,SPELL_FROSTBOLT,SPELL_WRATH_OF_MISERY),
                                                      RAND(H_SPELL_ARCANE_BLAST,H_SPELL_BLIZZARD,H_SPELL_FROSTBOLT,H_SPELL_WRATH_OF_MISERY)));
-                    uiTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS);
+                    uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS);
                 } else uiTimer -= diff;
                 break;
         }
@@ -207,7 +207,7 @@ struct boss_novosAI : public Scripted_NoMovementAI
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             Phase = PHASE_2;
-            uiTimer = 1*IN_MILISECONDS;
+            uiTimer = 1*IN_MILLISECONDS;
         }
     }
 
@@ -236,7 +236,7 @@ struct mob_crystal_handlerAI : public ScriptedAI
 
     void Reset()
     {
-        uiFlashOfDarknessTimer = 5*IN_MILISECONDS;
+        uiFlashOfDarknessTimer = 5*IN_MILLISECONDS;
     }
 
     void JustDied(Unit* /*killer*/)
@@ -253,7 +253,7 @@ struct mob_crystal_handlerAI : public ScriptedAI
         if (uiFlashOfDarknessTimer <= diff)
         {
             DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS,H_SPELL_FLASH_OF_DARKNESS));
-            uiFlashOfDarknessTimer = 5*IN_MILISECONDS;
+            uiFlashOfDarknessTimer = 5*IN_MILLISECONDS;
         } else uiFlashOfDarknessTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 363ee5ad89c..46121f49849 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -85,10 +85,10 @@ struct boss_tharon_jaAI : public ScriptedAI
 
     void Reset()
     {
-        uiPhaseTimer = 20*IN_MILISECONDS;
-        uiCurseOfLifeTimer = 1*IN_MILISECONDS;
-        uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
-        uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+        uiPhaseTimer = 20*IN_MILLISECONDS;
+        uiCurseOfLifeTimer = 1*IN_MILLISECONDS;
+        uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
+        uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
         Phase = SKELETAL;
         me->SetDisplayId(me->GetNativeDisplayId());
         if (pInstance)
@@ -116,26 +116,26 @@ struct boss_tharon_jaAI : public ScriptedAI
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_CURSE_OF_LIFE);
-                    uiCurseOfLifeTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+                    uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
                 } else uiCurseOfLifeTimer -= diff;
 
                 if (uiShadowVolleyTimer < diff)
                 {
                     DoCastVictim(SPELL_SHADOW_VOLLEY);
-                    uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+                    uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
                 } else uiShadowVolleyTimer -= diff;
 
                 if (uiRainOfFireTimer < diff)
                 {
                     DoCastAOE(SPELL_RAIN_OF_FIRE);
-                    uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
+                    uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
                 } else uiRainOfFireTimer -= diff;
 
                 if (uiPhaseTimer < diff)
                 {
                     DoCast(SPELL_DECAY_FLESH);
                     Phase = GOING_FLESH;
-                    uiPhaseTimer = 6*IN_MILISECONDS;
+                    uiPhaseTimer = 6*IN_MILLISECONDS;
                 } else uiPhaseTimer -= diff;
 
                 DoMeleeAttackIfReady();
@@ -155,10 +155,10 @@ struct boss_tharon_jaAI : public ScriptedAI
                             pTemp->SetDisplayId(MODEL_SKELETON);
                         }
                     }
-                    uiPhaseTimer = 20*IN_MILISECONDS;
-                    uiLightningBreathTimer = urand(3*IN_MILISECONDS,4*IN_MILISECONDS);
-                    uiEyeBeamTimer = urand(4*IN_MILISECONDS,8*IN_MILISECONDS);
-                    uiPoisonCloudTimer = urand(6*IN_MILISECONDS,7*IN_MILISECONDS);
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
+                    uiLightningBreathTimer = urand(3*IN_MILLISECONDS,4*IN_MILLISECONDS);
+                    uiEyeBeamTimer = urand(4*IN_MILLISECONDS,8*IN_MILLISECONDS);
+                    uiPoisonCloudTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS);
                     Phase = FLESH;
                 } else uiPhaseTimer -= diff;
                 break;
@@ -167,27 +167,27 @@ struct boss_tharon_jaAI : public ScriptedAI
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_LIGHTNING_BREATH);
-                    uiLightningBreathTimer = urand(6*IN_MILISECONDS,7*IN_MILISECONDS);
+                    uiLightningBreathTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS);
                 } else uiLightningBreathTimer -= diff;
 
                 if (uiEyeBeamTimer < diff)
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_EYE_BEAM);
-                    uiEyeBeamTimer = urand(4*IN_MILISECONDS,6*IN_MILISECONDS);
+                    uiEyeBeamTimer = urand(4*IN_MILLISECONDS,6*IN_MILLISECONDS);
                 } else uiEyeBeamTimer -= diff;
 
                 if (uiPoisonCloudTimer < diff)
                 {
                     DoCastAOE(SPELL_POISON_CLOUD);
-                    uiPoisonCloudTimer = urand(10*IN_MILISECONDS,12*IN_MILISECONDS);
+                    uiPoisonCloudTimer = urand(10*IN_MILLISECONDS,12*IN_MILLISECONDS);
                 } else uiPoisonCloudTimer -= diff;
 
                 if (uiPhaseTimer < diff)
                 {
                     DoCast(SPELL_RETURN_FLESH);
                     Phase = GOING_SKELETAL;
-                    uiPhaseTimer = 6*IN_MILISECONDS;
+                    uiPhaseTimer = 6*IN_MILLISECONDS;
                 } else uiPhaseTimer -= diff;
                 DoMeleeAttackIfReady();
                 break;
@@ -197,10 +197,10 @@ struct boss_tharon_jaAI : public ScriptedAI
                     DoScriptText(RAND(SAY_SKELETON_1,SAY_SKELETON_2), me);
                     me->DeMorph();
                     Phase = SKELETAL;
-                    uiPhaseTimer = 20*IN_MILISECONDS;
-                    uiCurseOfLifeTimer = 1*IN_MILISECONDS;
-                    uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
-                    uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
+                    uiCurseOfLifeTimer = 1*IN_MILLISECONDS;
+                    uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
+                    uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
                     std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList();
                     for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
                     {
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index deae70bfd08..4281ab53463 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -76,12 +76,12 @@ struct boss_trollgoreAI : public ScriptedAI
 
     void Reset()
     {
-        uiConsumeTimer = 15*IN_MILISECONDS;
-        uiAuraCountTimer = 15.5*IN_MILISECONDS;
-        uiCrushTimer = urand(1*IN_MILISECONDS,5*IN_MILISECONDS);
-        uiInfectedWoundTimer = urand(60*IN_MILISECONDS,10*IN_MILISECONDS);
-        uiExplodeCorpseTimer = 3*IN_MILISECONDS;
-        uiSpawnTimer = urand(30*IN_MILISECONDS,40*IN_MILISECONDS);
+        uiConsumeTimer = 15*IN_MILLISECONDS;
+        uiAuraCountTimer = 15.5*IN_MILLISECONDS;
+        uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS);
+        uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS);
+        uiExplodeCorpseTimer = 3*IN_MILLISECONDS;
+        uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS);
 
         bAchiev = IsHeroic();
 
@@ -112,14 +112,14 @@ struct boss_trollgoreAI : public ScriptedAI
             uint32 spawnNumber = urand(2,DUNGEON_MODE(3,5));
             for (uint8 i = 0; i < spawnNumber; ++i)
                 DoSummon(RAND(NPC_DRAKKARI_INVADER_1,NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN);
-            uiSpawnTimer = urand(30*IN_MILISECONDS,40*IN_MILISECONDS);
+            uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS);
         } else uiSpawnTimer -= diff;
 
         if (uiConsumeTimer <= diff)
         {
             DoScriptText(SAY_CONSUME, me);
             DoCast(SPELL_CONSUME);
-            uiConsumeTimer = 15*IN_MILISECONDS;
+            uiConsumeTimer = 15*IN_MILLISECONDS;
         } else uiConsumeTimer -= diff;
 
         if (bAchiev)
@@ -132,20 +132,20 @@ struct boss_trollgoreAI : public ScriptedAI
         if (uiCrushTimer <= diff)
         {
             DoCastVictim(SPELL_CRUSH);
-            uiCrushTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiCrushTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiCrushTimer -= diff;
 
         if (uiInfectedWoundTimer <= diff)
         {
             DoCastVictim(SPELL_INFECTED_WOUND);
-            uiInfectedWoundTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
+            uiInfectedWoundTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
         } else uiInfectedWoundTimer -= diff;
 
         if (uiExplodeCorpseTimer <= diff)
         {
             DoCast(SPELL_CORPSE_EXPLODE);
             DoScriptText(SAY_EXPLODE, me);
-            uiExplodeCorpseTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS);
+            uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS);
         } else uiExplodeCorpseTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index 73b88a870f4..3bb998c7096 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -58,7 +58,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         me->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
         me->SetReactState(REACT_PASSIVE);
-        MightyBlowTimer = 10*IN_MILISECONDS;
+        MightyBlowTimer = 10*IN_MILLISECONDS;
         bHealth = false;
         bHealth1 = false;
     }
@@ -114,7 +114,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI
         if (MightyBlowTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MIGHTY_BLOW, true);
-            MightyBlowTimer = 10*IN_MILISECONDS;
+            MightyBlowTimer = 10*IN_MILLISECONDS;
         } else MightyBlowTimer -= diff;
 
         if (!me->hasUnitState(UNIT_STAT_STUNNED))
@@ -152,7 +152,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
     {
         if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
             CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(me, true);
-        uiSurgeTimer = 7*IN_MILISECONDS;
+        uiSurgeTimer = 7*IN_MILLISECONDS;
         bGoToColossus = false;
     }
 
@@ -195,7 +195,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
         if (uiSurgeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SURGE);
-            uiSurgeTimer = 7*IN_MILISECONDS;
+            uiSurgeTimer = 7*IN_MILLISECONDS;
         } else uiSurgeTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -222,8 +222,8 @@ struct npc_living_mojoAI : public ScriptedAI
 
     void Reset()
     {
-        uiMojoWaveTimer = 2*IN_MILISECONDS;
-        uiMojoPuddleTimer = 7*IN_MILISECONDS;
+        uiMojoWaveTimer = 2*IN_MILLISECONDS;
+        uiMojoPuddleTimer = 7*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -267,13 +267,13 @@ struct npc_living_mojoAI : public ScriptedAI
         if (uiMojoWaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MOJO_WAVE);
-            uiMojoWaveTimer = 15*IN_MILISECONDS;
+            uiMojoWaveTimer = 15*IN_MILLISECONDS;
         } else uiMojoWaveTimer -= diff;
 
         if (uiMojoPuddleTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MOJO_PUDDLE);
-            uiMojoPuddleTimer = 18*IN_MILISECONDS;
+            uiMojoPuddleTimer = 18*IN_MILLISECONDS;
         } else uiMojoPuddleTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index f4b87cd1ee0..8ddcc12ae49 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -47,10 +47,10 @@ struct boss_eckAI : public ScriptedAI
 
     void Reset()
     {
-        uiBerserkTimer = urand(60*IN_MILISECONDS,90*IN_MILISECONDS); //60-90 secs according to wowwiki
-        uiBiteTimer = 5*IN_MILISECONDS;
-        uiSpitTimer = 10*IN_MILISECONDS;
-        uiSpringTimer = 8*IN_MILISECONDS;
+        uiBerserkTimer = urand(60*IN_MILLISECONDS,90*IN_MILLISECONDS); //60-90 secs according to wowwiki
+        uiBiteTimer = 5*IN_MILLISECONDS;
+        uiSpitTimer = 10*IN_MILLISECONDS;
+        uiSpringTimer = 8*IN_MILLISECONDS;
 
         bBerserk = false;
 
@@ -73,13 +73,13 @@ struct boss_eckAI : public ScriptedAI
         if (uiBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ECK_BITE);
-            uiBiteTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS);
+            uiBiteTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS);
         } else uiBiteTimer -= diff;
 
         if (uiSpitTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ECK_SPIT);
-            uiSpitTimer = urand(6*IN_MILISECONDS,14*IN_MILISECONDS);
+            uiSpitTimer = urand(6*IN_MILLISECONDS,14*IN_MILLISECONDS);
         } else uiSpitTimer -= diff;
 
         if (uiSpringTimer <= diff)
@@ -88,7 +88,7 @@ struct boss_eckAI : public ScriptedAI
             if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2));
-                uiSpringTimer = urand(5*IN_MILISECONDS,10*IN_MILISECONDS);
+                uiSpringTimer = urand(5*IN_MILLISECONDS,10*IN_MILLISECONDS);
             }
         } else uiSpringTimer -= diff;
 
@@ -141,7 +141,7 @@ struct npc_ruins_dwellerAI : public ScriptedAI
         {
             pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID());
             if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0)
-                me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILISECONDS);
+                me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS);
         }
     }
 };
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index dae642f68af..e90b244b118 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -94,13 +94,13 @@ struct boss_gal_darahAI : public ScriptedAI
 
     void Reset()
     {
-        uiStampedeTimer = 10*IN_MILISECONDS;
-        uiWhirlingSlashTimer = 21*IN_MILISECONDS;
-        uiPunctureTimer = 10*IN_MILISECONDS;
-        uiEnrageTimer = 15*IN_MILISECONDS;
-        uiImpalingChargeTimer = 21*IN_MILISECONDS;
-        uiStompTimer = 25*IN_MILISECONDS;
-        uiTransformationTimer = 9*IN_MILISECONDS;
+        uiStampedeTimer = 10*IN_MILLISECONDS;
+        uiWhirlingSlashTimer = 21*IN_MILLISECONDS;
+        uiPunctureTimer = 10*IN_MILLISECONDS;
+        uiEnrageTimer = 15*IN_MILLISECONDS;
+        uiImpalingChargeTimer = 21*IN_MILLISECONDS;
+        uiStompTimer = 25*IN_MILLISECONDS;
+        uiTransformationTimer = 9*IN_MILLISECONDS;
         uiPhaseCounter = 0;
 
         lImpaledPlayers.clear();
@@ -140,7 +140,7 @@ struct boss_gal_darahAI : public ScriptedAI
                         Phase = RHINO;
                         uiPhaseCounter = 0;
                         DoScriptText(SAY_TRANSFORM_1, me);
-                        uiTransformationTimer = 5*IN_MILISECONDS;
+                        uiTransformationTimer = 5*IN_MILLISECONDS;
                         bStartOfTransformation = true;
                         me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
                         me->SetReactState(REACT_AGGRESSIVE);
@@ -163,13 +163,13 @@ struct boss_gal_darahAI : public ScriptedAI
                     {
                         DoCast(me, SPELL_STAMPEDE);
                         DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me);
-                        uiStampedeTimer = 15*IN_MILISECONDS;
+                        uiStampedeTimer = 15*IN_MILLISECONDS;
                     } else uiStampedeTimer -= diff;
 
                     if (uiWhirlingSlashTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_WHIRLING_SLASH);
-                        uiWhirlingSlashTimer = 21*IN_MILISECONDS;
+                        uiWhirlingSlashTimer = 21*IN_MILLISECONDS;
                         ++uiPhaseCounter;
                     } else uiWhirlingSlashTimer -= diff;
                 }
@@ -183,7 +183,7 @@ struct boss_gal_darahAI : public ScriptedAI
                         Phase = TROLL;
                         uiPhaseCounter = 0;
                         DoScriptText(SAY_TRANSFORM_2, me);
-                        uiTransformationTimer = 9*IN_MILISECONDS;
+                        uiTransformationTimer = 9*IN_MILLISECONDS;
                         bStartOfTransformation = true;
                         me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
                         me->SetReactState(REACT_AGGRESSIVE);
@@ -205,19 +205,19 @@ struct boss_gal_darahAI : public ScriptedAI
                     if (uiPunctureTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_PUNCTURE);
-                        uiPunctureTimer = 8*IN_MILISECONDS;
+                        uiPunctureTimer = 8*IN_MILLISECONDS;
                     } else uiPunctureTimer -= diff;
 
                     if (uiEnrageTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_ENRAGE);
-                        uiEnrageTimer = 20*IN_MILISECONDS;
+                        uiEnrageTimer = 20*IN_MILLISECONDS;
                     } else uiEnrageTimer -= diff;
 
                     if (uiStompTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_STOMP);
-                        uiStompTimer = 20*IN_MILISECONDS;
+                        uiStompTimer = 20*IN_MILLISECONDS;
                     } else uiStompTimer -= diff;
 
                     if (uiImpalingChargeTimer <= diff)
@@ -227,7 +227,7 @@ struct boss_gal_darahAI : public ScriptedAI
                             DoCast(pTarget, SPELL_IMPALING_CHARGE);
                             lImpaledPlayers.insert(pTarget->GetGUID());
                         }
-                        uiImpalingChargeTimer = 31*IN_MILISECONDS;
+                        uiImpalingChargeTimer = 31*IN_MILLISECONDS;
                         ++uiPhaseCounter;
                     } else uiImpalingChargeTimer -= diff;
                 }
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 388efc70e56..7a9278b2fde 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -66,10 +66,10 @@ struct boss_moorabiAI : public ScriptedAI
 
     void Reset()
     {
-        uiGroundTremorTimer = 18*IN_MILISECONDS;
-        uiNumblingShoutTimer =  10*IN_MILISECONDS;
-        uiDeterminedStabTimer = 20*IN_MILISECONDS;
-        uiTransformationTImer = 12*IN_MILISECONDS;
+        uiGroundTremorTimer = 18*IN_MILLISECONDS;
+        uiNumblingShoutTimer =  10*IN_MILLISECONDS;
+        uiDeterminedStabTimer = 20*IN_MILLISECONDS;
+        uiTransformationTImer = 12*IN_MILLISECONDS;
         bPhase = false;
 
         if (pInstance)
@@ -104,7 +104,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_QUAKE, true);
             else
                 DoCast(me->getVictim(), SPELL_GROUND_TREMOR, true);
-            uiGroundTremorTimer = 10*IN_MILISECONDS;
+            uiGroundTremorTimer = 10*IN_MILLISECONDS;
         } else uiGroundTremorTimer -= uiDiff;
 
         if (uiNumblingShoutTimer <= uiDiff)
@@ -113,7 +113,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_NUMBING_ROAR, true);
             else
                 DoCast(me->getVictim(), SPELL_NUMBING_SHOUT, true);
-            uiNumblingShoutTimer = 10*IN_MILISECONDS;
+            uiNumblingShoutTimer = 10*IN_MILLISECONDS;
         } else uiNumblingShoutTimer -=uiDiff;
 
         if (uiDeterminedStabTimer <= uiDiff)
@@ -122,7 +122,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_DETERMINED_GORE);
             else
                 DoCast(me->getVictim(), SPELL_DETERMINED_STAB, true);
-            uiDeterminedStabTimer = 8*IN_MILISECONDS;
+            uiDeterminedStabTimer = 8*IN_MILLISECONDS;
         } else uiDeterminedStabTimer -=uiDiff;
 
         if (!bPhase && uiTransformationTImer <= uiDiff)
@@ -130,7 +130,7 @@ struct boss_moorabiAI : public ScriptedAI
             DoScriptText(EMOTE_TRANSFORM, me);
             DoScriptText(SAY_TRANSFORM, me);
             DoCast(me, SPELL_TRANSFORMATION, false);
-            uiTransformationTImer = 10*IN_MILISECONDS;
+            uiTransformationTImer = 10*IN_MILLISECONDS;
         } else uiTransformationTImer -= uiDiff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 56d8c6f1857..47a55440b92 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -85,10 +85,10 @@ struct boss_slad_ranAI : public ScriptedAI
 
     void Reset()
     {
-        uiPoisonNovaTimer = 10*IN_MILISECONDS;
-        uiPowerfullBiteTimer = 3*IN_MILISECONDS;
-        uiVenomBoltTimer = 15*IN_MILISECONDS;
-        uiSpawnTimer = 5*IN_MILISECONDS;
+        uiPoisonNovaTimer = 10*IN_MILLISECONDS;
+        uiPowerfullBiteTimer = 3*IN_MILLISECONDS;
+        uiVenomBoltTimer = 15*IN_MILLISECONDS;
+        uiSpawnTimer = 5*IN_MILLISECONDS;
         uiPhase = 0;
 
         lSummons.DespawnAll();
@@ -114,19 +114,19 @@ struct boss_slad_ranAI : public ScriptedAI
         if (uiPoisonNovaTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POISON_NOVA);
-            uiPoisonNovaTimer = 15*IN_MILISECONDS;
+            uiPoisonNovaTimer = 15*IN_MILLISECONDS;
         } else uiPoisonNovaTimer -= diff;
 
         if (uiPowerfullBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POWERFULL_BITE);
-            uiPowerfullBiteTimer = 10*IN_MILISECONDS;
+            uiPowerfullBiteTimer = 10*IN_MILLISECONDS;
         } else uiPowerfullBiteTimer -= diff;
 
         if (uiVenomBoltTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_VENOM_BOLT);
-            uiVenomBoltTimer = 10*IN_MILISECONDS;
+            uiVenomBoltTimer = 10*IN_MILLISECONDS;
         } else uiVenomBoltTimer -= diff;
 
         if (uiPhase)
@@ -135,11 +135,11 @@ struct boss_slad_ranAI : public ScriptedAI
             {
                 if (uiPhase == 1)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                        me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                 if (uiPhase == 2)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
-                uiSpawnTimer = 5*IN_MILISECONDS;
+                        me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
+                uiSpawnTimer = 5*IN_MILLISECONDS;
             } else uiSpawnTimer -= diff;
         }
 
@@ -186,7 +186,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI
 
     void Reset()
     {
-        uiGripOfSladRanTimer = 1*IN_MILISECONDS;
+        uiGripOfSladRanTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -196,7 +196,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI
         if (uiGripOfSladRanTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_GRIP_OF_SLAD_RAN);
-            uiGripOfSladRanTimer = 5*IN_MILISECONDS;
+            uiGripOfSladRanTimer = 5*IN_MILLISECONDS;
         } else uiGripOfSladRanTimer -= diff;
     }
 
@@ -213,7 +213,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI
 
     void Reset()
     {
-        uiVenomousBiteTimer = 2*IN_MILISECONDS;
+        uiVenomousBiteTimer = 2*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -224,7 +224,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI
         if (uiVenomousBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_VENOMOUS_BITE);
-            uiVenomousBiteTimer = 10*IN_MILISECONDS;
+            uiVenomousBiteTimer = 10*IN_MILLISECONDS;
         } else uiVenomousBiteTimer -= diff;
     }
 };
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 2aa150bec76..767aeabcc42 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -78,7 +78,7 @@ struct boss_anomalusAI : public ScriptedAI
     void Reset()
     {
         Phase = 0;
-        uiSparkTimer = 5*IN_MILISECONDS;
+        uiSparkTimer = 5*IN_MILLISECONDS;
         uiChaoticRiftGUID = 0;
 
         bDeadChaoticRift = false;
@@ -139,7 +139,7 @@ struct boss_anomalusAI : public ScriptedAI
             Phase = 1;
             DoScriptText(SAY_SHIELD, me);
             DoCast(me, SPELL_RIFT_SHIELD);
-            Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
             if (Rift)
             {
                 //DoCast(Rift, SPELL_CHARGE_RIFT);
@@ -155,7 +155,7 @@ struct boss_anomalusAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_SPARK);
-            uiSparkTimer = 5*IN_MILISECONDS;
+            uiSparkTimer = 5*IN_MILLISECONDS;
         } else uiSparkTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -188,8 +188,8 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
 
     void Reset()
     {
-        uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS;
-        uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
+        uiChaoticEnergyBurstTimer = 1*IN_MILLISECONDS;
+        uiSummonCrazedManaWraithTimer = 5*IN_MILLISECONDS;
         //me->SetDisplayId(25206); //For some reason in DB models for ally and horde are different.
                                          //Model for ally (1126) does not show auras. Horde model works perfect.
                                          //Set model to horde number
@@ -215,20 +215,20 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
                     DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST);
                 else
                     DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST);
-            uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS;
+            uiChaoticEnergyBurstTimer = 1*IN_MILLISECONDS;
         } else uiChaoticEnergyBurstTimer -= diff;
 
         if (uiSummonCrazedManaWraithTimer <= diff)
         {
-            Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
             if (Wraith)
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     Wraith->AI()->AttackStart(pTarget);
             Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
             if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD))
-                uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
+                uiSummonCrazedManaWraithTimer = 5*IN_MILLISECONDS;
             else
-                uiSummonCrazedManaWraithTimer = 10*IN_MILISECONDS;
+                uiSummonCrazedManaWraithTimer = 10*IN_MILLISECONDS;
         } else uiSummonCrazedManaWraithTimer -= diff;
     }
 };
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index b3db17167b6..befa9fb068d 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -71,12 +71,12 @@ struct boss_keristraszaAI : public ScriptedAI
 
     void Reset()
     {
-        uiCrystalfireBreathTimer = 14*IN_MILISECONDS;
-        uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS);
-        uiTailSweepTimer = 5*IN_MILISECONDS;
+        uiCrystalfireBreathTimer = 14*IN_MILLISECONDS;
+        uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
+        uiTailSweepTimer = 5*IN_MILLISECONDS;
         bEnrage = false;
 
-        uiCheckIntenseColdTimer = 2*IN_MILISECONDS;
+        uiCheckIntenseColdTimer = 2*IN_MILLISECONDS;
         bMoreThanTwoIntenseCold = false;
 
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
@@ -175,7 +175,7 @@ struct boss_keristraszaAI : public ScriptedAI
                     break;
                 }
             }
-            uiCheckIntenseColdTimer = 2*IN_MILISECONDS;
+            uiCheckIntenseColdTimer = 2*IN_MILLISECONDS;
         } else uiCheckIntenseColdTimer -= diff;
 
         if (!bEnrage && HealthBelowPct(25))
@@ -188,13 +188,13 @@ struct boss_keristraszaAI : public ScriptedAI
         if (uiCrystalfireBreathTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH);
-            uiCrystalfireBreathTimer = 14*IN_MILISECONDS;
+            uiCrystalfireBreathTimer = 14*IN_MILLISECONDS;
         } else uiCrystalfireBreathTimer -= diff;
 
         if (uiTailSweepTimer <= diff)
         {
             DoCast(me, SPELL_TAIL_SWEEP);
-            uiTailSweepTimer = 5*IN_MILISECONDS;
+            uiTailSweepTimer = 5*IN_MILLISECONDS;
         } else uiTailSweepTimer -= diff;
 
         if (uiCrystalChainsCrystalizeTimer <= diff)
@@ -204,7 +204,7 @@ struct boss_keristraszaAI : public ScriptedAI
                 DoCast(me, SPELL_CRYSTALIZE);
             else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_CRYSTAL_CHAINS);
-            uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS);
+            uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
         } else uiCrystalChainsCrystalizeTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index dbcb1dc2a58..77dd3025451 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -50,7 +50,7 @@ enum Yells
 enum Achievements
 {
     ACHIEV_SPLIT_PERSONALITY                      = 2150,
-    ACHIEV_TIMER                                  = 5*IN_MILISECONDS
+    ACHIEV_TIMER                                  = 5*IN_MILLISECONDS
 };
 
 const Position  CenterOfRoom = {504.80, 89.07, -16.12, 6.27};
@@ -88,9 +88,9 @@ struct boss_magus_telestraAI : public ScriptedAI
     {
         Phase = 0;
         //These times are probably wrong
-        uiIceNovaTimer =  7*IN_MILISECONDS;
+        uiIceNovaTimer =  7*IN_MILLISECONDS;
         uiFireBombTimer =  0;
-        uiGravityWellTimer = 15*IN_MILISECONDS;
+        uiGravityWellTimer = 15*IN_MILLISECONDS;
         uiCooldown = 0;
 
         uiFireMagusGUID = 0;
@@ -137,7 +137,7 @@ struct boss_magus_telestraAI : public ScriptedAI
 
     uint64 SplitPersonality(uint32 entry)
     {
-        if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS))
+        if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS))
         {
             switch (entry)
             {
@@ -224,7 +224,7 @@ struct boss_magus_telestraAI : public ScriptedAI
                 uiFrostMagusGUID = 0;
                 uiArcaneMagusGUID = 0;
                 bIsWaitingToAppear = true;
-                uiIsWaitingToAppearTimer = 4*IN_MILISECONDS;
+                uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS;
                 DoScriptText(SAY_MERGE, me);
                 bIsAchievementTimerRunning = false;
                 uiAchievementTimer = 0;
@@ -283,9 +283,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(pTarget, SPELL_ICE_NOVA, false);
-                uiCooldown = 1.5*IN_MILISECONDS;
+                uiCooldown = 1.5*IN_MILLISECONDS;
             }
-            uiIceNovaTimer = 15*IN_MILISECONDS;
+            uiIceNovaTimer = 15*IN_MILLISECONDS;
         } else uiIceNovaTimer -= diff;
 
         if (uiGravityWellTimer <= diff)
@@ -293,9 +293,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = me->getVictim())
             {
                 DoCast(pTarget, SPELL_GRAVITY_WELL);
-                uiCooldown = 6*IN_MILISECONDS;
+                uiCooldown = 6*IN_MILLISECONDS;
             }
-            uiGravityWellTimer = 15*IN_MILISECONDS;
+            uiGravityWellTimer = 15*IN_MILLISECONDS;
         } else uiGravityWellTimer -= diff;
 
         if (uiFireBombTimer <= diff)
@@ -303,9 +303,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(pTarget, SPELL_FIREBOMB, false);
-                uiCooldown = 2*IN_MILISECONDS;
+                uiCooldown = 2*IN_MILLISECONDS;
             }
-            uiFireBombTimer = 2*IN_MILISECONDS;
+            uiFireBombTimer = 2*IN_MILLISECONDS;
         } else uiFireBombTimer -=diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index dffdbf8d20d..c28aff66ed1 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -76,10 +76,10 @@ struct boss_ormorokAI : public ScriptedAI
 
     void Reset()
     {
-        uiCrystalSpikesTimer = 12*IN_MILISECONDS;
-        uiTrampleTimer = 10*IN_MILISECONDS;
-        uiSpellReflectionTimer = 30*IN_MILISECONDS;
-        uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS;
+        uiCrystalSpikesTimer = 12*IN_MILLISECONDS;
+        uiTrampleTimer = 10*IN_MILLISECONDS;
+        uiSpellReflectionTimer = 30*IN_MILLISECONDS;
+        uiSummonCrystallineTanglerTimer = 17*IN_MILLISECONDS;
         bFrenzy = false;
         bCrystalSpikes = false;
 
@@ -126,7 +126,7 @@ struct boss_ormorokAI : public ScriptedAI
                 fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2)));
                 fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2)));
                 for (uint8 i = 0; i < 4; ++i)
-                    me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS);
+                    me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILLISECONDS);
                 if (++uiCrystalSpikesCount >= 13)
                     bCrystalSpikes = false;
                 uiCrystalSpikesTimer2 = 200;
@@ -141,14 +141,14 @@ struct boss_ormorokAI : public ScriptedAI
         if (uiTrampleTimer <= diff)
         {
             DoCast(me, SPELL_TRAMPLE);
-            uiTrampleTimer = 10*IN_MILISECONDS;
+            uiTrampleTimer = 10*IN_MILLISECONDS;
         } else uiTrampleTimer -= diff;
 
         if (uiSpellReflectionTimer <= diff)
         {
             DoScriptText(SAY_REFLECT, me);
             DoCast(me, SPELL_SPELL_REFLECTION);
-            uiSpellReflectionTimer = 30*IN_MILISECONDS;
+            uiSpellReflectionTimer = 30*IN_MILLISECONDS;
         } else uiSpellReflectionTimer -= diff;
 
         if (uiCrystalSpikesTimer <= diff)
@@ -161,7 +161,7 @@ struct boss_ormorokAI : public ScriptedAI
             fBaseY = me->GetPositionY();
             fBaseZ = me->GetPositionZ();
             fBaseO = me->GetOrientation();
-            uiCrystalSpikesTimer = 20*IN_MILISECONDS;
+            uiCrystalSpikesTimer = 20*IN_MILLISECONDS;
         } else uiCrystalSpikesTimer -= diff;
 
         if (IsHeroic() && (uiSummonCrystallineTanglerTimer <= diff))
@@ -201,7 +201,7 @@ struct boss_ormorokAI : public ScriptedAI
                     Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f);
                 }
             }
-            uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS;
+            uiSummonCrystallineTanglerTimer = 17*IN_MILLISECONDS;
         } else uiSummonCrystallineTanglerTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -219,8 +219,8 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI
 
     void Reset()
     {
-        SpellCrystalSpikeDamageTimer = 3.7*IN_MILISECONDS;
-        SpellCrystalSpikePrevisualTimer = 1*IN_MILISECONDS;
+        SpellCrystalSpikeDamageTimer = 3.7*IN_MILLISECONDS;
+        SpellCrystalSpikePrevisualTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -228,13 +228,13 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI
         if (SpellCrystalSpikePrevisualTimer <= diff)
         {
             DoCast(me, SPELL_CRYSTAL_SPIKE_PREVISUAL);
-            SpellCrystalSpikePrevisualTimer = 10*IN_MILISECONDS;
+            SpellCrystalSpikePrevisualTimer = 10*IN_MILLISECONDS;
         } else SpellCrystalSpikePrevisualTimer -= diff;
 
         if (SpellCrystalSpikeDamageTimer <= diff)
         {
             DoCast(me, SPELL_CRYSTALL_SPIKE_DAMAGE);
-            SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS;
+            SpellCrystalSpikeDamageTimer = 10*IN_MILLISECONDS;
         } else SpellCrystalSpikeDamageTimer -= diff;
     }
 };
@@ -247,7 +247,7 @@ struct mob_crystalline_tanglerAI : public ScriptedAI
 
     void Reset()
     {
-        uiRootsTimer = 1*IN_MILISECONDS;
+        uiRootsTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -257,7 +257,7 @@ struct mob_crystalline_tanglerAI : public ScriptedAI
             if (me->IsWithinDist(me->getVictim(), 5.0f, false))
             {
                 DoCast(me->getVictim(), SPELL_ROOTS);
-                uiRootsTimer = 15*IN_MILISECONDS;
+                uiRootsTimer = 15*IN_MILLISECONDS;
             }
         } else uiRootsTimer -= diff;
     }
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 00de292678d..a1201b838c5 100755
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -189,7 +189,7 @@ struct npc_unstable_sphereAI : public ScriptedAI
         if (uiPulseTimer <= uiDiff)
         {
             DoCast(SPELL_UNSTABLE_SPHERE_PULSE);
-            uiPulseTimer = 3*IN_MILISECONDS;
+            uiPulseTimer = 3*IN_MILLISECONDS;
         } else uiPulseTimer -= uiDiff;
 
         if (uiDeathTimer <= uiDiff)
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 70773e6258e..ffeda4d4b7f 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -252,7 +252,7 @@ struct boss_sartharionAI : public ScriptedAI
         m_bIsBerserk = false;
         m_bIsSoftEnraged = false;
 
-        m_uiEnrageTimer = 15*MINUTE*IN_MILISECONDS;
+        m_uiEnrageTimer = 15*MINUTE*IN_MILLISECONDS;
         m_bIsHardEnraged = false;
 
         m_uiTenebronTimer = 30000;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index 49863dab607..88c240b49bd 100755
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -94,10 +94,10 @@ struct boss_ionarAI : public ScriptedAI
         bIsSplitPhase = true;
         bHasDispersed = false;
 
-        uiSplitTimer = 25*IN_MILISECONDS;
+        uiSplitTimer = 25*IN_MILLISECONDS;
 
-        uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS);
-        uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS);
+        uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS);
+        uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS);
 
         uiDisperseHealth = 45 + urand(0,10);
 
@@ -200,7 +200,7 @@ struct boss_ionarAI : public ScriptedAI
         {
             if (uiSplitTimer <= uiDiff)
             {
-                uiSplitTimer = 2.5*IN_MILISECONDS;
+                uiSplitTimer = 2.5*IN_MILLISECONDS;
 
                 // Return sparks to where Ionar splitted
                 if (bIsSplitPhase)
@@ -216,7 +216,7 @@ struct boss_ionarAI : public ScriptedAI
 
                     DoCast(me, SPELL_SPARK_DESPAWN, false);
 
-                    uiSplitTimer = 25*IN_MILISECONDS;
+                    uiSplitTimer = 25*IN_MILLISECONDS;
                     bIsSplitPhase = true;
 
                     if (me->getVictim())
@@ -234,7 +234,7 @@ struct boss_ionarAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_STATIC_OVERLOAD);
 
-            uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS);
+            uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS);
         }
         else
             uiStaticOverloadTimer -= uiDiff;
@@ -242,7 +242,7 @@ struct boss_ionarAI : public ScriptedAI
         if (uiBallLightningTimer <= uiDiff)
         {
             DoCast(me->getVictim(), SPELL_BALL_LIGHTNING);
-            uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS);
+            uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS);
         }
         else
             uiBallLightningTimer -= uiDiff;
@@ -310,7 +310,7 @@ struct mob_spark_of_ionarAI : public ScriptedAI
 
     void Reset()
     {
-        uiCheckTimer = 2*IN_MILISECONDS;
+        uiCheckTimer = 2*IN_MILLISECONDS;
         me->SetReactState(REACT_PASSIVE);
     }
 
@@ -358,7 +358,7 @@ struct mob_spark_of_ionarAI : public ScriptedAI
                 else
                     me->ForcedDespawn();
             }
-            uiCheckTimer = 2*IN_MILISECONDS;
+            uiCheckTimer = 2*IN_MILLISECONDS;
         }
         else
             uiCheckTimer -= uiDiff;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 2bea610891e..964f30adb91 100755
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -253,7 +253,7 @@ struct boss_skadiAI : public ScriptedAI
                 break;
             case CREATURE_TRIGGER:
                 pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true);
-                pSummoned->ForcedDespawn(10*IN_MILISECONDS);
+                pSummoned->ForcedDespawn(10*IN_MILLISECONDS);
                 break;
         }
         Summons.Summon(pSummoned);
@@ -276,7 +276,7 @@ struct boss_skadiAI : public ScriptedAI
                 Phase = SKADI;
                 me->SetFlying(false);
                 me->Unmount();
-                if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILISECONDS))
+                if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS))
                 {
                     pGrauf->GetMotionMaster()->MoveFall(0);
                     pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 0367cb760cb..bd3cf42c502 100755
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -105,7 +105,7 @@ struct boss_svalaAI : public ScriptedAI
     void Reset()
     {
         Phase = IDLE;
-        uiIntroTimer = 1*IN_MILISECONDS;
+        uiIntroTimer = 1*IN_MILLISECONDS;
         uiIntroPhase = 0;
         uiArthasGUID = 0;
 
@@ -150,28 +150,28 @@ struct boss_svalaAI : public ScriptedAI
                 case 0:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 1:
                     DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 2:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 3:
                     DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 4:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me);
                     DoCast(me, SPELL_SVALA_TRANSFORMING1);
                     ++uiIntroPhase;
-                    uiIntroTimer = 2.8*IN_MILISECONDS;
+                    uiIntroTimer = 2.8*IN_MILLISECONDS;
                     break;
                 case 5:
                     DoCast(me, SPELL_SVALA_TRANSFORMING2);
@@ -179,7 +179,7 @@ struct boss_svalaAI : public ScriptedAI
                     uiIntroTimer = 200;
                     break;
                 case 6:
-                    if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILISECONDS))
+                    if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILLISECONDS))
                     {
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                         me->SetDisplayId(DATA_SVALA_DISPLAY_ID);
@@ -244,10 +244,10 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
 
     void Reset()
     {
-        uiSinsterStrikeTimer = 7*IN_MILISECONDS;
-        uiCallFlamesTimer = 10*IN_MILISECONDS;
-        uiRitualOfSwordTimer = 20*IN_MILISECONDS;
-        uiSacrificeTimer = 8*IN_MILISECONDS;
+        uiSinsterStrikeTimer = 7*IN_MILLISECONDS;
+        uiCallFlamesTimer = 10*IN_MILLISECONDS;
+        uiRitualOfSwordTimer = 20*IN_MILLISECONDS;
+        uiSacrificeTimer = 8*IN_MILLISECONDS;
 
         bSacrificed = false;
 
@@ -294,7 +294,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
             if (uiSinsterStrikeTimer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_SINSTER_STRIKE);
-                uiSinsterStrikeTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
+                uiSinsterStrikeTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
             } else uiSinsterStrikeTimer -= diff;
 
             if (uiCallFlamesTimer <= diff)
@@ -302,7 +302,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 {
                     DoCast(pTarget, SPELL_CALL_FLAMES);
-                    uiCallFlamesTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS);
+                    uiCallFlamesTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS);
                 }
             } else uiCallFlamesTimer -= diff;
 
@@ -348,7 +348,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->GetMotionMaster()->MoveChase(pTarget);
 
-                uiSacrificeTimer = 8*IN_MILISECONDS;
+                uiSacrificeTimer = 8*IN_MILLISECONDS;
             }
             else uiSacrificeTimer -= diff;
         }
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index e8fbe46507c..80051ace614 100755
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -199,7 +199,7 @@ struct instance_violet_hold : public ScriptedInstance
 
         uiActivationTimer = 5000;
         uiDoorSpellTimer = 2000;
-        uiCyanigosaEventTimer = 3*IN_MILISECONDS;
+        uiCyanigosaEventTimer = 3*IN_MILLISECONDS;
 
         bActive = false;
         bIsDoorSpellCasted = false;
@@ -726,13 +726,13 @@ struct instance_violet_hold : public ScriptedInstance
                     case 1:
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
                         DoScriptText(CYANIGOSA_SAY_SPAWN, pCyanigosa);
-                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 7*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 2:
                         pCyanigosa->GetMotionMaster()->MoveJump(MiddleRoomLocation.GetPositionX(), MiddleRoomLocation.GetPositionY(), MiddleRoomLocation.GetPositionZ(), 10.0f, 20.0f);
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
-                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 7*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 3:
@@ -740,7 +740,7 @@ struct instance_violet_hold : public ScriptedInstance
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_SPELL_TRANSFORM, 0);
                         pCyanigosa->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                         pCyanigosa->SetReactState(REACT_AGGRESSIVE);
-                        uiCyanigosaEventTimer = 2*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 2*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 4:
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 884e71e7c36..61b891c7535 100755
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -68,7 +68,7 @@ struct instance_sethekk_halls : public ScriptedInstance
         {
             case DATA_IKISSDOOREVENT:
                 if (data == DONE)
-                    DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILISECONDS);
+                    DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILLISECONDS);
                 break;
             case TYPE_ANZU_ENCOUNTER:
                 AnzuEncounter = data;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 22ba195fb72..56cbf1cabcb 100755
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -59,12 +59,12 @@ struct instance_ramparts : public ScriptedInstance
         {
             case TYPE_VAZRUDEN:
                 if (uiData == DONE && m_auiEncounter[1] == DONE)
-                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS);
+                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILLISECONDS);
                 m_auiEncounter[0] = uiData;
                 break;
             case TYPE_NAZAN:
                 if (uiData == DONE && m_auiEncounter[0] == DONE)
-                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS);
+                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILLISECONDS);
                 m_auiEncounter[1] = uiData;
                 break;
         }
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index a95ec8b6aff..cad93995675 100755
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1850,7 +1850,7 @@ struct npc_ebon_gargoyleAI : CasterAI
         me->GetMotionMaster()->MovePoint(0, x, y, z);
 
         // Despawn as soon as possible
-        despawnTimer = 4 * IN_MILISECONDS;
+        despawnTimer = 4 * IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 0922ac254dc..f7407e78aac 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -168,7 +168,7 @@ enum TimeConstants
     WEEK   = DAY*7,
     MONTH  = DAY*30,
     YEAR   = MONTH*12,
-    IN_MILISECONDS = 1000
+    IN_MILLISECONDS = 1000
 };
 
 enum AccountTypes
-- 
cgit v1.2.3