From 1d2d3693c43b9c7856de7069776946d8a18d095d Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 4 May 2009 13:13:07 -0500 Subject: [PATCH] *Replace some "mangos_debug" with "trinity_debug" --HG-- branch : trunk --- src/game/AchievementMgr.cpp | 2 +- src/game/CreatureEventAI.cpp | 2 +- src/game/WorldSession.cpp | 2 +- win/VC80/ScriptsInterfaces.vcproj | 4 ++-- win/VC80/TrinityCore.vcproj | 4 ++-- win/VC80/TrinityRealm.vcproj | 4 ++-- win/VC80/framework.vcproj | 4 ++-- win/VC80/game.vcproj | 4 ++-- win/VC80/shared.vcproj | 4 ++-- win/VC80/sockets.vcproj | 4 ++-- win/VC90/ScriptsInterfaces.vcproj | 4 ++-- win/VC90/TrinityCore.vcproj | 4 ++-- win/VC90/TrinityRealm.vcproj | 4 ++-- win/VC90/framework.vcproj | 8 ++++---- win/VC90/game.vcproj | 4 ++-- win/VC90/shared.vcproj | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index aa1aab97a..6c0e2272a 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -443,7 +443,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) if(GetPlayer()->GetSession()->PlayerLoading()) return; - #ifdef MANGOS_DEBUG + #ifdef TRINITY_DEBUG if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) sLog.outDebug("AchievementMgr::SendAchievementEarned(%u)", achievement->ID); #endif diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index a1ee2a388..fb7b71198 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -49,7 +49,7 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c) { //Debug check - #ifndef MANGOS_DEBUG + #ifndef TRINITY_DEBUG if ((*i).event_flags & EFLAG_DEBUG_ONLY) continue; #endif diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 780c02edd..0977990cc 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -130,7 +130,7 @@ void WorldSession::SendPacket(WorldPacket const* packet) sendLastPacketBytes = packet->wpos(); // wpos is real written size } - #endif // !MANGOS_DEBUG + #endif // !TRINITY_DEBUG if (m_Socket->SendPacket (*packet) == -1) m_Socket->CloseSocket (); diff --git a/win/VC80/ScriptsInterfaces.vcproj b/win/VC80/ScriptsInterfaces.vcproj index 283f1133c..63821de22 100644 --- a/win/VC80/ScriptsInterfaces.vcproj +++ b/win/VC80/ScriptsInterfaces.vcproj @@ -210,7 +210,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -293,7 +293,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/TrinityCore.vcproj b/win/VC80/TrinityCore.vcproj index cbf933d07..2d252123d 100644 --- a/win/VC80/TrinityCore.vcproj +++ b/win/VC80/TrinityCore.vcproj @@ -149,7 +149,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -250,7 +250,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/TrinityRealm.vcproj b/win/VC80/TrinityRealm.vcproj index 6707381b1..dfd64134a 100644 --- a/win/VC80/TrinityRealm.vcproj +++ b/win/VC80/TrinityRealm.vcproj @@ -444,7 +444,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -543,7 +543,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj index cfe9b049c..dd46cd112 100644 --- a/win/VC80/framework.vcproj +++ b/win/VC80/framework.vcproj @@ -196,7 +196,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -271,7 +271,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index 76221759a..96817c410 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/MP /Zm200" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -460,7 +460,7 @@ AdditionalOptions="/MP /bigobj" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index 7d708a318..f27a92869 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -287,7 +287,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" @@ -447,7 +447,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/win/VC80/sockets.vcproj b/win/VC80/sockets.vcproj index 3055b0207..4463b730b 100644 --- a/win/VC80/sockets.vcproj +++ b/win/VC80/sockets.vcproj @@ -205,7 +205,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" @@ -438,7 +438,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/win/VC90/ScriptsInterfaces.vcproj b/win/VC90/ScriptsInterfaces.vcproj index 2d38d3d50..e64e7eeab 100644 --- a/win/VC90/ScriptsInterfaces.vcproj +++ b/win/VC90/ScriptsInterfaces.vcproj @@ -372,7 +372,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -455,7 +455,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj index fc4b8b99c..5894f03e6 100644 --- a/win/VC90/TrinityCore.vcproj +++ b/win/VC90/TrinityCore.vcproj @@ -450,7 +450,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -552,7 +552,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj index 3bb0008b2..e8854c107 100644 --- a/win/VC90/TrinityRealm.vcproj +++ b/win/VC90/TrinityRealm.vcproj @@ -442,7 +442,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -541,7 +541,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj index 6ea281984..8639ac00d 100644 --- a/win/VC90/framework.vcproj +++ b/win/VC90/framework.vcproj @@ -122,7 +122,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -197,7 +197,7 @@ AdditionalOptions="/Zl /MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" MinimalRebuild="false" RuntimeLibrary="2" @@ -348,7 +348,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -424,7 +424,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 5a251c980..fcd4f3c3d 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -377,7 +377,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -458,7 +458,7 @@ AdditionalOptions="/MP /bigobj" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index da94c81df..11aaff125 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -370,7 +370,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -450,7 +450,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true"