diff options
| -rw-r--r-- | src/game/SpellMgr.cpp | 14 | ||||
| -rw-r--r-- | win/VC80/TrinityCore.vcproj | 56 |
2 files changed, 35 insertions, 35 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 1e9ae3531dd..41faea5b8fb 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1332,14 +1332,14 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool // return true; //use data of highest rank spell(needed for spells which ranks have different effects) - SpellEntry const *spellInfo1=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_1)); - SpellEntry const *spellInfo2=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_2)); + spellInfo_1=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_1)); + spellInfo_2=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_2)); //if spells have exactly the same effect they cannot stack for(uint32 i = 0; i < 3; ++i) - if(spellInfo1->Effect[i] != spellInfo2->Effect[i] - || spellInfo1->EffectApplyAuraName[i] != spellInfo2->EffectApplyAuraName[i] - || spellInfo1->EffectMiscValue[i] != spellInfo2->EffectMiscValue[i]) // paladin resist aura + if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i] + || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i] + || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura return false; // need itemtype check? need an example to add that check return true; @@ -1430,8 +1430,8 @@ void SpellMgr::LoadSpellRequired() bar.step(); sLog.outString(); - sLog.outString( ">> Loaded 0 spell chain records" ); - sLog.outErrorDb("`spell_chains` table is empty!"); + sLog.outString( ">> Loaded 0 spell required records" ); + sLog.outErrorDb("`spell_required` table is empty!"); return; } uint32 rows = 0; diff --git a/win/VC80/TrinityCore.vcproj b/win/VC80/TrinityCore.vcproj index 6209bd3f9aa..6a1051581b7 100644 --- a/win/VC80/TrinityCore.vcproj +++ b/win/VC80/TrinityCore.vcproj @@ -119,7 +119,7 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug|Win32" OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" @@ -142,19 +142,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -171,7 +169,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -179,9 +177,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" - LinkIncremental="1" + Version="" + LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" @@ -189,9 +189,9 @@ GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" - LinkTimeCodeGeneration="0" + LargeAddressAware="2" ImportLibrary="$(OutDir)\TrinityCore.lib" - TargetMachine="17" + FixedBaseAddress="1" /> <Tool Name="VCALinkTool" @@ -220,7 +220,7 @@ /> </Configuration> <Configuration - Name="Debug|Win32" + Name="Release|x64" OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" @@ -243,17 +243,19 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" + TargetEnvironment="3" + TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" - IgnoreStandardIncludePath="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -270,7 +272,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -278,11 +280,9 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" - Version="" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" @@ -290,9 +290,9 @@ GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" - LargeAddressAware="2" + LinkTimeCodeGeneration="0" ImportLibrary="$(OutDir)\TrinityCore.lib" - FixedBaseAddress="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" |