diff options
| -rw-r--r-- | sql/FULL/world_trinity_string_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/4741_world.sql | 3 | ||||
| -rw-r--r-- | src/game/BattleGroundAV.cpp | 187 | ||||
| -rw-r--r-- | src/game/Language.h | 9 | ||||
| -rw-r--r-- | win/VC90/game.vcproj | 82 | ||||
| -rw-r--r-- | win/VC90/shared.vcproj | 50 |
6 files changed, 147 insertions, 185 deletions
diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql index aef32a5950c..183b0339a41 100644 --- a/sql/FULL/world_trinity_string_full.sql +++ b/sql/FULL/world_trinity_string_full.sql @@ -687,6 +687,7 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte (1330, 'The Horde Team is running out of reinforcements!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1331, 'The Frostwolf General is Dead!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1332, 'The Stormpike General is Dead!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1333, 'The Battle for Alterac Valley begins in 2 minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/sql/updates/4741_world.sql b/sql/updates/4741_world.sql new file mode 100644 index 00000000000..a2eec215382 --- /dev/null +++ b/sql/updates/4741_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` where `entry` IN(1333); +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES +(1333, 'The Battle for Alterac Valley begins in 2 minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
\ No newline at end of file diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index c6e319c37b5..0a1bf72d595 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -34,11 +34,10 @@ BattleGroundAV::BattleGroundAV() m_BgObjects.resize(BG_AV_OBJECT_MAX); m_BgCreatures.resize(AV_CPLACE_MAX+AV_STATICCPLACE_MAX); - //TODO FIX ME! - m_StartMessageIds[BG_STARTING_EVENT_FIRST] = LANG_BG_EY_START_TWO_MINUTES; - m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_EY_START_ONE_MINUTE; - m_StartMessageIds[BG_STARTING_EVENT_THIRD] = LANG_BG_EY_START_HALF_MINUTE; - m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_EY_HAS_BEGUN; + m_StartMessageIds[BG_STARTING_EVENT_FIRST] = LANG_BG_AV_START_TWO_MINUTES; + m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AV_START_ONE_MINUTE; + m_StartMessageIds[BG_STARTING_EVENT_THIRD] = LANG_BG_AV_START_HALF_MINUTE; + m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AV_HAS_BEGUN; } BattleGroundAV::~BattleGroundAV() @@ -300,117 +299,8 @@ Creature* BattleGroundAV::AddAVCreature(uint16 cinfoid, uint16 type ) void BattleGroundAV::Update(uint32 diff) { BattleGround::Update(diff); - if (GetStatus() == STATUS_WAIT_JOIN && GetPlayersSize()) - { - ModifyStartDelayTime(diff); - - if (!(m_Events & 0x01)) - { - m_Events |= 0x01; - - if(!SetupBattleGround()) - { - EndNow(); - return; - } - uint16 i; - sLog.outDebug("Alterac Valley: entering state STATUS_WAIT_JOIN ..."); - // Initial Nodes - for(i = 0; i < BG_AV_OBJECT_MAX; i++) - SpawnBGObject(i, RESPAWN_ONE_DAY); - for(i = BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_GRAVE ; i++){ - SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+3*i,RESPAWN_IMMEDIATELY); - SpawnBGObject(i, RESPAWN_IMMEDIATELY); - } - for(i = BG_AV_OBJECT_FLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER ; i++) - SpawnBGObject(i, RESPAWN_IMMEDIATELY); - for(i = BG_AV_OBJECT_FLAG_H_ICEBLOOD_GRAVE; i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER ; i++){ - SpawnBGObject(i, RESPAWN_IMMEDIATELY); - if(i<=BG_AV_OBJECT_FLAG_H_FROSTWOLF_HUT) - SpawnBGObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+3*GetNodeThroughObject(i),RESPAWN_IMMEDIATELY); - } - for(i = BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_TFLAG_A_STONEHEART_BUNKER; i+=2) - { - SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag - SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura - } - for(i = BG_AV_OBJECT_TFLAG_H_ICEBLOOD_TOWER; i <= BG_AV_OBJECT_TFLAG_H_FROSTWOLF_WTOWER; i+=2) - { - SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag - SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura - } - //snowfall and the doors - for(i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++) - SpawnBGObject(i, RESPAWN_IMMEDIATELY); - SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE,RESPAWN_IMMEDIATELY); - - //creatures - sLog.outDebug("BG_AV start poputlating nodes"); - for(BG_AV_Nodes i= BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i ) - { - if(m_Nodes[i].Owner) - PopulateNode(i); - } - //all creatures which don't get despawned through the script are static - sLog.outDebug("BG_AV: start spawning static creatures"); - for(i=0; i < AV_STATICCPLACE_MAX; i++ ) - AddAVCreature(0,i+AV_CPLACE_MAX); - //mainspiritguides: - sLog.outDebug("BG_AV: start spawning spiritguides creatures"); - AddSpiritGuide(7, BG_AV_CreaturePos[7][0], BG_AV_CreaturePos[7][1], BG_AV_CreaturePos[7][2], BG_AV_CreaturePos[7][3], ALLIANCE); - AddSpiritGuide(8, BG_AV_CreaturePos[8][0], BG_AV_CreaturePos[8][1], BG_AV_CreaturePos[8][2], BG_AV_CreaturePos[8][3], HORDE); - //spawn the marshals (those who get deleted, if a tower gets destroyed) - sLog.outDebug("BG_AV: start spawning marshal creatures"); - for(i=AV_NPC_A_MARSHAL_SOUTH; i<= AV_NPC_H_MARSHAL_WTOWER; i++) - AddAVCreature(i,AV_CPLACE_A_MARSHAL_SOUTH+(i-AV_NPC_A_MARSHAL_SOUTH)); - - AddAVCreature(AV_NPC_HERALD,AV_CPLACE_HERALD); - DoorClose(BG_AV_OBJECT_DOOR_A); - DoorClose(BG_AV_OBJECT_DOOR_H); - - SetStartDelayTime(BG_START_DELAY_2M); - } - // After 1 minute, warning is signalled - else if (GetStartDelayTime() <= BG_START_DELAY_1M && !(m_Events & 0x04)) - { - m_Events |= 0x04; - SendMessageToAll(LANG_BG_AV_ONEMINTOSTART, CHAT_MSG_BG_SYSTEM_NEUTRAL); - } - // After 1,5 minute, warning is signalled - else if (GetStartDelayTime() <= BG_START_DELAY_1M + BG_START_DELAY_30S && !(m_Events & 0x08)) - { - m_Events |= 0x08; - SendMessageToAll(LANG_BG_AV_HALFMINTOSTART, CHAT_MSG_BG_SYSTEM_NEUTRAL); - } - // After 2 minutes, gates OPEN ! x) - else if (GetStartDelayTime() <= 0 && !(m_Events & 0x10)) - { - UpdateWorldState(AV_SHOW_H_SCORE, 1); - UpdateWorldState(AV_SHOW_A_SCORE, 1); - m_Events |= 0x10; - - SendMessageToAll(LANG_BG_AV_STARTED, CHAT_MSG_BG_SYSTEM_NEUTRAL); - PlaySoundToAll(SOUND_BG_START); - SetStatus(STATUS_IN_PROGRESS); - - sLog.outDebug("BG_AV: start spawning mine stuff"); - for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_N_MAX;i++) - SpawnBGObject(i,RESPAWN_IMMEDIATELY); - for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_S_MAX;i++) - SpawnBGObject(i,RESPAWN_IMMEDIATELY); - for(uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population - ChangeMineOwner(mine, AV_NEUTRAL_TEAM,true); - DoorOpen(BG_AV_OBJECT_DOOR_H); - DoorOpen(BG_AV_OBJECT_DOOR_A); - - - for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) - if(Player* plr = objmgr.GetPlayer(itr->first)) - plr->RemoveAurasDueToSpell(SPELL_PREPARATION); - } - } - else if(GetStatus() == STATUS_IN_PROGRESS) + if(GetStatus() == STATUS_IN_PROGRESS) { for(uint8 i=0; i<=1;i++)//0=alliance, 1=horde { @@ -470,10 +360,25 @@ void BattleGroundAV::Update(uint32 diff) void BattleGroundAV::StartingEventCloseDoors() { + DoorClose(BG_AV_OBJECT_DOOR_A); + DoorClose(BG_AV_OBJECT_DOOR_H); } void BattleGroundAV::StartingEventOpenDoors() { + sLog.outDebug("BG_AV: start spawning mine stuff"); + for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_N_MAX;i++) + SpawnBGObject(i,RESPAWN_IMMEDIATELY); + for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_S_MAX;i++) + SpawnBGObject(i,RESPAWN_IMMEDIATELY); + for(uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population + ChangeMineOwner(mine, AV_NEUTRAL_TEAM,true); + + UpdateWorldState(AV_SHOW_H_SCORE, 1); + UpdateWorldState(AV_SHOW_A_SCORE, 1); + + DoorOpen(BG_AV_OBJECT_DOOR_H); + DoorOpen(BG_AV_OBJECT_DOOR_A); } void BattleGroundAV::AddPlayer(Player *plr) @@ -1345,6 +1250,58 @@ bool BattleGroundAV::SetupBattleGround() return false; } } + + uint16 i; + sLog.outDebug("Alterac Valley: entering state STATUS_WAIT_JOIN ..."); + // Initial Nodes + for(i = 0; i < BG_AV_OBJECT_MAX; i++) + SpawnBGObject(i, RESPAWN_ONE_DAY); + for(i = BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_GRAVE ; i++){ + SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+3*i,RESPAWN_IMMEDIATELY); + SpawnBGObject(i, RESPAWN_IMMEDIATELY); + } + for(i = BG_AV_OBJECT_FLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER ; i++) + SpawnBGObject(i, RESPAWN_IMMEDIATELY); + for(i = BG_AV_OBJECT_FLAG_H_ICEBLOOD_GRAVE; i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER ; i++){ + SpawnBGObject(i, RESPAWN_IMMEDIATELY); + if(i<=BG_AV_OBJECT_FLAG_H_FROSTWOLF_HUT) + SpawnBGObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+3*GetNodeThroughObject(i),RESPAWN_IMMEDIATELY); + } + for(i = BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_TFLAG_A_STONEHEART_BUNKER; i+=2) + { + SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag + SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura + } + for(i = BG_AV_OBJECT_TFLAG_H_ICEBLOOD_TOWER; i <= BG_AV_OBJECT_TFLAG_H_FROSTWOLF_WTOWER; i+=2) + { + SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag + SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura + } + //snowfall and the doors + for(i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++) + SpawnBGObject(i, RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE,RESPAWN_IMMEDIATELY); + + //creatures + sLog.outDebug("BG_AV start poputlating nodes"); + for(BG_AV_Nodes i= BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i ) + { + if(m_Nodes[i].Owner) + PopulateNode(i); + } + //all creatures which don't get despawned through the script are static + sLog.outDebug("BG_AV: start spawning static creatures"); + for(i=0; i < AV_STATICCPLACE_MAX; i++ ) + AddAVCreature(0,i+AV_CPLACE_MAX); + //mainspiritguides: + sLog.outDebug("BG_AV: start spawning spiritguides creatures"); + AddSpiritGuide(7, BG_AV_CreaturePos[7][0], BG_AV_CreaturePos[7][1], BG_AV_CreaturePos[7][2], BG_AV_CreaturePos[7][3], ALLIANCE); + AddSpiritGuide(8, BG_AV_CreaturePos[8][0], BG_AV_CreaturePos[8][1], BG_AV_CreaturePos[8][2], BG_AV_CreaturePos[8][3], HORDE); + //spawn the marshals (those who get deleted, if a tower gets destroyed) + sLog.outDebug("BG_AV: start spawning marshal creatures"); + for(i=AV_NPC_A_MARSHAL_SOUTH; i<= AV_NPC_H_MARSHAL_WTOWER; i++) + AddAVCreature(i,AV_CPLACE_A_MARSHAL_SOUTH+(i-AV_NPC_A_MARSHAL_SOUTH)); + AddAVCreature(AV_NPC_HERALD,AV_CPLACE_HERALD); return true; } diff --git a/src/game/Language.h b/src/game/Language.h index 20fae7a7166..bf0705a35cb 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -805,14 +805,15 @@ enum TrinityStrings LANG_BG_AV_NODE_TOWER_FROST_W = 1324, LANG_BG_AV_NODE_GRAVE_FROST_HUT = 1325, - LANG_BG_AV_ONEMINTOSTART = 1326, - LANG_BG_AV_HALFMINTOSTART = 1327, - LANG_BG_AV_STARTED = 1328, + LANG_BG_AV_START_ONE_MINUTE = 1326, + LANG_BG_AV_START_HALF_MINUTE = 1327, + LANG_BG_AV_HAS_BEGUN = 1328, LANG_BG_AV_A_NEAR_LOSE = 1329, LANG_BG_AV_H_NEAR_LOSE = 1330, LANG_BG_AV_H_CAPTAIN_DEAD = 1331, LANG_BG_AV_A_CAPTAIN_DEAD = 1332, - // FREE IDS 1333-1999 + LANG_BG_AV_START_TWO_MINUTES = 1333, + // FREE IDS 1334-1999 // Ticket Strings 2000-2029 LANG_COMMAND_TICKETNEW = 2000, diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 5dd84765415..def17c39984 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -102,7 +102,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|Win32" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -124,19 +124,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /bigobj /Zm200" - Optimization="0" + AdditionalOptions="/MP /Zm200" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" - StringPooling="false" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="pchdef.h" @@ -157,7 +155,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -165,7 +163,6 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" SuppressStartupBanner="true" /> @@ -186,7 +183,7 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Debug_NoPCH|Win32" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -211,17 +208,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /Zm200" - InlineFunctionExpansion="1" + AdditionalOptions="/MP" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + StringPooling="false" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="pchdef.h" + UsePrecompiledHeader="0" PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -232,14 +229,13 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" - ForcedIncludeFiles="pchdef.h" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -267,7 +263,7 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug|x64" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -294,13 +290,14 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP /bigobj /Zm200" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + StringPooling="false" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="pchdef.h" @@ -321,7 +318,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -350,7 +347,7 @@ /> </Configuration> <Configuration - Name="Debug_NoPCH|Win32" + Name="Release|x64" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -372,20 +369,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="0" + AdditionalOptions="/MP /bigobj /Zm200" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" - StringPooling="false" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" - UsePrecompiledHeader="0" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pchdef.h" PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -396,13 +394,14 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" + ForcedIncludeFiles="pchdef.h" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -410,6 +409,7 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" SuppressStartupBanner="true" /> @@ -1712,7 +1712,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -1721,7 +1721,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index 0d9acfe9d92..a47b7e34a5d 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -101,7 +101,7 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug|Win32" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -124,21 +124,19 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -154,7 +152,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -162,7 +160,6 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" @@ -184,7 +181,7 @@ /> </Configuration> <Configuration - Name="Debug|Win32" + Name="Debug_NoPCH|Win32" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -244,7 +241,7 @@ <Tool Name="VCLibrarianTool" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" SuppressStartupBanner="true" /> <Tool @@ -264,7 +261,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|x64" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -292,15 +289,16 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -316,7 +314,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -346,7 +344,7 @@ /> </Configuration> <Configuration - Name="Debug_NoPCH|Win32" + Name="Debug|x64" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -369,6 +367,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -405,8 +404,9 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -878,7 +878,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" @@ -889,7 +889,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Debug_NoPCH|Win32" > <Tool Name="VCCustomBuildTool" @@ -900,7 +900,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|x64" > <Tool Name="VCCustomBuildTool" @@ -911,7 +911,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_NoPCH|Win32" + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" |