*Merged Scriptdev2 783

--HG-- branch : trunk
2008-12-13 19:56:53 +01:00
parent 8b4f5b6290
commit ed7a4d9831
131 changed files with 5742 additions and 4736 deletions
@@ -98,86 +98,8 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="precompiled.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="trinitycore.lib zthread.lib"
-				OutputFile="$(OutDir)/TrinityScript.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\..\win\VC90\zthread__$(PlatformName)_$(ConfigurationName);..\..\..\..\win\VC90\trinitycore__$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/TrinityScript.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
@@ -261,6 +183,90 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
+				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompiled.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="trinitycore.lib zthread.lib"
+				OutputFile="$(OutDir)/TrinityScript.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\win\VC90\zthread__$(PlatformName)_$(ConfigurationName);..\..\..\..\win\VC90\trinitycore__$(PlatformName)_$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/TrinityScript.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
@@ -500,6 +506,10 @@
 				<Filter
 					Name="Ashenvale Forest"
 					>
+					<File
+						RelativePath="..\scripts\zone\ashenvale_forest\ashenvale.cpp"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Azshara"
@@ -756,10 +766,6 @@
 						RelativePath="..\scripts\zone\scarlet_monastery\boss_high_inquisitor_fairbanks.cpp"
 						>
 					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_high_inquisitor_whitemane.cpp"
-						>
-					</File>
 					<File
 						RelativePath="..\scripts\zone\scarlet_monastery\boss_houndmaster_loksey.cpp"
 						>
@@ -769,7 +775,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_scarlet_commander_mograine.cpp"
+						RelativePath="..\scripts\zone\scarlet_monastery\boss_mograine_and_whitemane.cpp"
 						>
 					</File>
 					<File
@@ -1384,18 +1390,18 @@
 				<Filter
 					Name="Uldaman"
 					>
- 					<File
+					<File
 						RelativePath="..\scripts\zone\uldaman\boss_archaedas.cpp"
 						>
-					</File>					
-					<File
-						RelativePath="..\scripts\zone\uldaman\instance_uldaman.cpp"
-						>
-					</File>					
+					</File>
 					<File
 						RelativePath="..\scripts\zone\uldaman\boss_ironaya.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\scripts\zone\uldaman\instance_uldaman.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\scripts\zone\uldaman\uldaman.cpp"
 						>
@@ -1786,7 +1792,7 @@
 						<File
 							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
 							>
-						</File>						
+						</File>
 						<File
 							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"
 							>
@@ -1832,11 +1838,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\instance_mechanar.cpp"
+							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\def_mechanar.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\def_mechanar.h"
+							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\instance_mechanar.cpp"
 							>
 						</File>
 					</Filter>
@@ -1932,10 +1938,6 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
-							>
-						</File>
-						<File						
 							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
 							>
 						</File>
@@ -1943,6 +1945,10 @@
 							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
 							>
 						</File>
+						<File
+							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
+							>
+						</File>
 						<File
 							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
 							>
@@ -2326,7 +2332,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2334,7 +2340,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"