All pastes #638155 Raw Edit

Unnamed

public text v1 · immutable
#638155 ·published 2007-07-29 15:59 UTC
rendered paste body
Index: src/shared/MemoryLeaks.h
===================================================================
--- src/shared/MemoryLeaks.h	(revision 4054)
+++ src/shared/MemoryLeaks.h	(working copy)
@@ -21,7 +21,7 @@
 
 #if COMPILER == COMPILER_MICROSOFT
 // Visual Leak Detector support enabled
-#include <vld/vld.h>
+//#include <vld/vld.h>
 // standard Visual Studio leak check disabled, 
 //#  define _CRTDBG_MAP_ALLOC
 //#  include <stdlib.h>
Index: win/mangosdVC80.sln
===================================================================
--- win/mangosdVC80.sln	(revision 4054)
+++ win/mangosdVC80.sln	(working copy)
@@ -17,7 +17,6 @@
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480} = {262199E8-EEDF-4700-A1D1-E9CC901CF480}
 	EndProjectSection
 EndProject
@@ -29,11 +28,11 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC80\realmd.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
 	ProjectSection(ProjectDependencies) = postProject
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480} = {262199E8-EEDF-4700-A1D1-E9CC901CF480}
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
 		{A3A04E47-43A2-4C08-90B3-029CEF558594} = {A3A04E47-43A2-4C08-90B3-029CEF558594}
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "script", "VC80\script.vcproj", "{4205C8A9-79B7-4354-8064-F05FB9CA0C96}"
Index: win/VC71/mangosd.vcproj
===================================================================
--- win/VC71/mangosd.vcproj	(revision 4054)
+++ win/VC71/mangosd.vcproj	(working copy)
@@ -48,8 +48,7 @@
 				AdditionalLibraryDirectories="..\..\dep\lib\release"
 				ProgramDatabaseFile=".\..\..\bin\Release/mangosd.pdb"
 				SubSystem="1"
-				ImportLibrary="$(OutDir)/mangosd.lib"
-			/>
+				ImportLibrary="$(OutDir)/mangosd.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\..\..\bin\Release/mangosd.tlb"/>
@@ -109,14 +108,14 @@
 				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\..\..\bin\Debug\mangosd.exe"
 				Version=""
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\dep\lib\debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\..\..\bin\Debug/mangosd.pdb"
 				SubSystem="1"
 				ImportLibrary="$(OutDir)/mangosd.lib"
-			/>
+				FixedBaseAddress="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\..\..\bin\Debug/mangosd.tlb"/>
@@ -147,80 +146,61 @@
 	</References>
 	<Files>
 		<Filter
-			Name="doc"
-			>
+			Name="doc">
 			<File
-				RelativePath="..\..\Authors"
-				>
+				RelativePath="..\..\Authors">
 			</File>
 			<File
-				RelativePath="..\..\ChangeLog"
-				>
+				RelativePath="..\..\ChangeLog">
 			</File>
 			<File
-				RelativePath="..\..\Copying"
-				>
+				RelativePath="..\..\Copying">
 			</File>
 			<File
-				RelativePath="..\..\Install"
-				>
+				RelativePath="..\..\Install">
 			</File>
 			<File
-				RelativePath="..\..\News"
-				>
+				RelativePath="..\..\News">
 			</File>
 			<File
-				RelativePath="..\..\Readme"
-				>
+				RelativePath="..\..\Readme">
 			</File>
 			<File
-				RelativePath="..\..\Thanks"
-				>
+				RelativePath="..\..\Thanks">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\src\game\AccountMgr.cpp"
-			>
+			RelativePath="..\..\src\game\AccountMgr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\game\AccountMgr.h"
-			>
+			RelativePath="..\..\src\game\AccountMgr.h">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\CliRunnable.cpp"
-			>
+			RelativePath="..\..\src\mangosd\CliRunnable.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\CliRunnable.h"
-			>
+			RelativePath="..\..\src\mangosd\CliRunnable.h">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\Main.cpp"
-			>
+			RelativePath="..\..\src\mangosd\Main.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\Master.cpp"
-			>
+			RelativePath="..\..\src\mangosd\Master.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\Master.h"
-			>
+			RelativePath="..\..\src\mangosd\Master.h">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\RASocket.cpp"
-			>
+			RelativePath="..\..\src\mangosd\RASocket.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\RASocket.h"
-			>
+			RelativePath="..\..\src\mangosd\RASocket.h">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\WorldRunnable.cpp"
-			>
+			RelativePath="..\..\src\mangosd\WorldRunnable.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\mangosd\WorldRunnable.h"
-			>
+			RelativePath="..\..\src\mangosd\WorldRunnable.h">
 		</File>
 	</Files>
 	<Globals>
Index: win/VC71/realmd.vcproj
===================================================================
--- win/VC71/realmd.vcproj	(revision 4054)
+++ win/VC71/realmd.vcproj	(working copy)
@@ -106,12 +106,13 @@
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\..\..\bin\Debug\realmd.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\dep\lib\debug;.\zthread___Win32_Debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\..\..\bin\Debug/realmd.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+				FixedBaseAddress="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\..\..\bin\Debug/realmd.tlb"/>
@@ -141,24 +142,19 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\realmd\AuthSocket.cpp"
-			>
+			RelativePath="..\..\src\realmd\AuthSocket.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\realmd\AuthSocket.h"
-			>
+			RelativePath="..\..\src\realmd\AuthSocket.h">
 		</File>
 		<File
-			RelativePath="..\..\src\realmd\Main.cpp"
-			>
+			RelativePath="..\..\src\realmd\Main.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\realmd\RealmList.cpp"
-			>
+			RelativePath="..\..\src\realmd\RealmList.cpp">
 		</File>
 		<File
-			RelativePath="..\..\src\realmd\RealmList.h"
-			>
+			RelativePath="..\..\src\realmd\RealmList.h">
 		</File>
 	</Files>
 	<Globals>
Index: win/VC71/script.vcproj
===================================================================
--- win/VC71/script.vcproj	(revision 4054)
+++ win/VC71/script.vcproj	(working copy)
@@ -28,20 +28,21 @@
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mangosd.lib  zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib"
 				OutputFile="$(OutDir)/MaNGOSScript.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\bin\debug;..\..\dep\lib\debug;.\zlib___Win32_Debug;.\zthread___Win32_Debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/MaNGOSScript.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -120,44 +121,34 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\bindings\universal\ScriptMgr.cpp"
-				>
+				RelativePath="..\..\src\bindings\universal\ScriptMgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\bindings\universal\system.cpp"
-				>
+				RelativePath="..\..\src\bindings\universal\system.cpp">
 			</File>
 			<Filter
-				Name="Scripts"
-				>
+				Name="Scripts">
 				<File
-					RelativePath="..\..\src\bindings\universal\Scripts\sc_default.cpp"
-					>
+					RelativePath="..\..\src\bindings\universal\Scripts\sc_default.cpp">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath="..\..\src\bindings\universal\config.h"
-				>
+				RelativePath="..\..\src\bindings\universal\config.h">
 			</File>
 			<File
-				RelativePath="..\..\src\bindings\universal\ScriptMgr.h"
-				>
+				RelativePath="..\..\src\bindings\universal\ScriptMgr.h">
 			</File>
 			<Filter
-				Name="Scripts"
-				>
+				Name="Scripts">
 				<File
-					RelativePath="..\..\src\bindings\universal\Scripts\sc_defines.h"
-					>
+					RelativePath="..\..\src\bindings\universal\Scripts\sc_defines.h">
 				</File>
 			</Filter>
 		</Filter>
Index: win/VC80/game.vcproj
===================================================================
--- win/VC80/game.vcproj	(revision 4054)
+++ win/VC80/game.vcproj	(working copy)
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
+				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_SQL_TRANSACTION;MANGOS_USE_VMAPS;MANGOS_USE_VMAP_HEIGHT"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
Index: win/VC80/mangosd.vcproj
===================================================================
--- win/VC80/mangosd.vcproj	(revision 4054)
+++ win/VC80/mangosd.vcproj	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="mangosd"
 	ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}"
 	RootNamespace="mangosd"