Procházet zdrojové kódy

G++ is now the default on trunk [MouseJstr]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@1443 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber před 20 roky
rodič
revize
616a90cc09

+ 20 - 0
.svnignore

@@ -0,0 +1,20 @@
+char-converter
+conf
+save
+char-server_sql
+map-server_sql
+ladmin
+char-server
+map-server
+login-server_sql
+login-server
+login-converter
+char-converter.exe
+char-server_sql.exe
+map-server_sql.exe
+ladmin.exe
+char-server.exe
+map-server.exe
+login-server_sql.exe
+login-server.exe
+login-converter.exe

+ 7 - 0
Changelog-Trunk.txt

@@ -0,0 +1,7 @@
+Date	Added
+
+04/07
+        * Switched to G++ as the default [MouseJstr]
+	* Enabled PCRE on by default [MouseJstr]
+	* cleaned up svn:ignore properties [MouseJstr]
+	* cleaned up svn:eol-style properties [MouseJstr]

+ 5 - 8
Makefile

@@ -1,14 +1,11 @@
 
-CC = gcc -pipe
-# CC = gcc -pipe -DPCRE_SUPPORT
-# CC = g++ --pipe
-# CC = gcc -pipe -DGCOLLECT
-# CC = gcc -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK
-# CC = /usr/local/bin/gcc -fbounds-checking -pipe -DBCHECK
+CC = g++ -pipe -DPCRE_SUPPORT
+# CC = g++ -pipe -DGCOLLECT
+# CC = g++ -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK
 
 # GCLIB = -lgc
-# GCLIB = -L/usr/local/lib -lpcre
-GCLIB =
+GCLIB = -L/usr/local/lib -lpcre
+# GCLIB =
 # GCLIB = -ldmalloc
 
 PACKETDEF = -DPACKETVER=6 -DNEW_006b -DSO_REUSEPORT

+ 32 - 32
README.win32

@@ -1,32 +1,32 @@
-       Building eAthena under win32
-
-There are currently two ways to build eAthena.   The first and oldest way is by using cygwin (www.cygwin.org).   This was the only way until the svn 1370 timeframe.  The second way is by using Visual Studio .NET 2003.
-
-Building using cygwin:
-
-  1) delete every copy of cygwin1.dll on your system
-  2) Go to www.cygwin.com and run the setup.exe.
-  3) install gcc, make, bash, g++, and gdb.  Basically install
-     all developer tools if possible.  If later you find you are
-     missing something, re-run the setup and install that
-  4) make sure the ../bin of wherever you installed cygwin to is in your
-     path.  ie, if you put cygwin in C:/cygwin then add c:/cygwin/bin
-     to your path 
-  5) return to this directory and type "make txt"
-
-Building using Visual Studio .NET 2003
-
-  1) Make sure you have the platform SDK installed when you install
-     this.  If you don't have it, you can go to microsoft and download a
-     copy. 
-  2) open the eAthena.sln file
-  3) Build the components you wish..
-
-  if you wish mysql support (http://dev.mysql.com/), grab a windows
-  install of mysql
-
-      http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-4.1.10a-win32.zip/from/pick#mirrors
-
-  and install it into the default location on the C drive.  This will
-  best match how I set up the solutions/project files
-
+       Building eAthena under win32
+
+There are currently two ways to build eAthena.   The first and oldest way is by using cygwin (www.cygwin.org).   This was the only way until the svn 1370 timeframe.  The second way is by using Visual Studio .NET 2003.
+
+Building using cygwin:
+
+  1) delete every copy of cygwin1.dll on your system
+  2) Go to www.cygwin.com and run the setup.exe.
+  3) install gcc, make, bash, g++, and gdb.  Basically install
+     all developer tools if possible.  If later you find you are
+     missing something, re-run the setup and install that
+  4) make sure the ../bin of wherever you installed cygwin to is in your
+     path.  ie, if you put cygwin in C:/cygwin then add c:/cygwin/bin
+     to your path 
+  5) return to this directory and type "make txt"
+
+Building using Visual Studio .NET 2003
+
+  1) Make sure you have the platform SDK installed when you install
+     this.  If you don't have it, you can go to microsoft and download a
+     copy. 
+  2) open the eAthena.sln file
+  3) Build the components you wish..
+
+  if you wish mysql support (http://dev.mysql.com/), grab a windows
+  install of mysql
+
+      http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-4.1.10a-win32.zip/from/pick#mirrors
+
+  and install it into the default location on the C drive.  This will
+  best match how I set up the solutions/project files
+

+ 23 - 23
db/item_findingore.txt

@@ -1,24 +1,24 @@
-// 鉱石発見スキルでドロップされる鉱石
-// item ID, Jname (dummy), 確率を 1 万倍 (100% なら 1000000)
-// 0 はデフォルト項目
-0,Iron Ore,1002
-714,Emperium,30000
-756,Rough Oridecon,200000
-757,Rough Elunium,200000
-969,Gold,20000
-984,Oridecon,100000
-985,Elunium,100000
-990,Red Blood,300000
-991,Crystal Blue,300000
-992,Wind of Verdure,300000
-993,Green Live,300000
-994,Flame Heart,150000
-995,Mystic Frozen,150000
-996,Rough Wind,150000
-997,Great Nature,150000
-998,Iron,800000
-999,Steel,500000
-1002,Iron Ore,1000000
-1003,Coal,600000
-1010,Phracon,950000
+// 鉱石発見スキルでドロップされる鉱石
+// item ID, Jname (dummy), 確率を 1 万倍 (100% なら 1000000)
+// 0 はデフォルト項目
+0,Iron Ore,1002
+714,Emperium,30000
+756,Rough Oridecon,200000
+757,Rough Elunium,200000
+969,Gold,20000
+984,Oridecon,100000
+985,Elunium,100000
+990,Red Blood,300000
+991,Crystal Blue,300000
+992,Wind of Verdure,300000
+993,Green Live,300000
+994,Flame Heart,150000
+995,Mystic Frozen,150000
+996,Rough Wind,150000
+997,Great Nature,150000
+998,Iron,800000
+999,Steel,500000
+1002,Iron Ore,1000000
+1003,Coal,600000
+1010,Phracon,950000
 1011,Emveretarcon,550000

+ 58 - 58
eAthena.sln

@@ -1,58 +1,58 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{D356871D-58E1-450B-967A-E1E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E1E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E1E9646175AF}.Release.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E1E9646175AF}.Release.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E2E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E2E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E2E9646175AF}.Release.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E2E9646175AF}.Release.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E3E9646175AF}.Release.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E3E9646175AF}.Release.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E4E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E4E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E4E9646175AF}.Release.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E5E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E5E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E5E9646175AF}.Release.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{D356871D-58E1-450B-967A-E1E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E1E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E1E9646175AF}.Release.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E1E9646175AF}.Release.Build.0 = Release|Win32
+		{D356871D-58E1-450B-967A-E2E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E2E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E2E9646175AF}.Release.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E2E9646175AF}.Release.Build.0 = Release|Win32
+		{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E3E9646175AF}.Release.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E3E9646175AF}.Release.Build.0 = Release|Win32
+		{D356871D-58E1-450B-967A-E4E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E4E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E4E9646175AF}.Release.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E5E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E5E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E5E9646175AF}.Release.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32
+		{D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

+ 2 - 0
src/common/.svnignore

@@ -0,0 +1,2 @@
+GNUmakefile
+obj

+ 25 - 25
src/common/dll.h

@@ -1,25 +1,25 @@
-
-#ifndef	_DLL_H_
-#define _DLL_H_
-
-#ifdef _WIN32
-
-	#include <windows.h>
-	#define DLL_OPEN(x)		LoadLibrary(x)
-	#define DLL_SYM(x,y,z)	(FARPROC)(x) = GetProcAddress(y,z)
-	#define DLL_CLOSE(x)	FreeLibrary(x)
-	#define DLL				HINSTANCE
-
-#else
-
-	#include <dlfcn.h>
-	#define DLL_OPEN(x)		dlopen(x,RTLD_NOW)
-	#define DLL_SYM(x,y,z)	(x) = (void *)dlsym(y,z)
-	#define DLL_CLOSE(x)	dlclose(x)
-	#define DLL				void *
-
-#endif
-
-#endif	// _DLL_H_
-
-
+
+#ifndef	_DLL_H_
+#define _DLL_H_
+
+#ifdef _WIN32
+
+	#include <windows.h>
+	#define DLL_OPEN(x)		LoadLibrary(x)
+	#define DLL_SYM(x,y,z)	(FARPROC)(x) = GetProcAddress(y,z)
+	#define DLL_CLOSE(x)	FreeLibrary(x)
+	#define DLL				HINSTANCE
+
+#else
+
+	#include <dlfcn.h>
+	#define DLL_OPEN(x)		dlopen(x,RTLD_NOW)
+	#define DLL_SYM(x,y,z)	(x) = (void *)dlsym(y,z)
+	#define DLL_CLOSE(x)	dlclose(x)
+	#define DLL				void *
+
+#endif
+
+#endif	// _DLL_H_
+
+

+ 3 - 0
src/map/.svnignore

@@ -0,0 +1,3 @@
+txtobj
+GNUmakefile
+sqlobj

+ 1 - 1
src/map/clif.c

@@ -8007,7 +8007,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c <
 	WFIFOSET(fd, WFIFOW(fd,2));
 
 #ifdef PCRE_SUPPORT
-        map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen(RFIFOP(fd,4)), &sd->bl);
+        map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen((char *) RFIFOP(fd,4)), &sd->bl);
 #endif
 
 	// Celest

+ 1 - 1
src/map/npc_chat.c

@@ -387,7 +387,7 @@ int npc_chat_sub(struct block_list *bl, va_list ap)
             int offsets[20];
             char buf[255];
             // perform pattern match
-            int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0, 
+            int r = pcre_exec(e->pcre_, e->pcre_extra_, (char *) msg, len, 0, 
                 0, offsets, sizeof(offsets) / sizeof(offsets[0]));
             if (r >= 0) {
                 // save out the matched strings

+ 183 - 183
vcproj/char-server_sql.vcproj

@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="char-server_sql"
-	ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-sqlchar"
-			IntermediateDirectory="Debug-sqlchar"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
-				OutputFile="../char-server_sql.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-sqlchar"
-			IntermediateDirectory="Release-sqlchar"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				OutputFile="../char-server_sql.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\char\char.c">
-			</File>
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_guild.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_party.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_pet.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_storage.c">
-			</File>
-			<File
-				RelativePath="..\src\char\inter.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="char-server_sql"
+	ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-sqlchar"
+			IntermediateDirectory="Debug-sqlchar"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				OutputFile="../char-server_sql.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-sqlchar"
+			IntermediateDirectory="Release-sqlchar"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				OutputFile="../char-server_sql.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\char\char.c">
+			</File>
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_guild.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_party.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_pet.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_storage.c">
+			</File>
+			<File
+				RelativePath="..\src\char\inter.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 182 - 182
vcproj/char-server_txt.vcproj

@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="char-server_txt"
-	ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-char"
-			IntermediateDirectory="Debug-char"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;;src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\char-server.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-char"
-			IntermediateDirectory="Release-char"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\common;;src\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\char-server.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\char\char.c">
-			</File>
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_guild.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_party.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_pet.c">
-			</File>
-			<File
-				RelativePath="..\src\char\int_storage.c">
-			</File>
-			<File
-				RelativePath="..\src\char\inter.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="char-server_txt"
+	ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-char"
+			IntermediateDirectory="Debug-char"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\char-server.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-char"
+			IntermediateDirectory="Release-char"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\char-server.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\char\char.c">
+			</File>
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_guild.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_party.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_pet.c">
+			</File>
+			<File
+				RelativePath="..\src\char\int_storage.c">
+			</File>
+			<File
+				RelativePath="..\src\char\inter.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 170 - 170
vcproj/login-server_sql.vcproj

@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="login-server_sql"
-	ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-sqllogin"
-			IntermediateDirectory="Debug-sqllogin"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"
-				OutputFile="..\login-server_sql.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-sqllogin"
-			IntermediateDirectory="Release-sqllogin"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"				OutputFile="..\login-server_sql.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\login\login.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\login\md5calc.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="login-server_sql"
+	ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-sqllogin"
+			IntermediateDirectory="Debug-sqllogin"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"
+				OutputFile="..\login-server_sql.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-sqllogin"
+			IntermediateDirectory="Release-sqllogin"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"				OutputFile="..\login-server_sql.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\login\login.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\login\md5calc.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 169 - 169
vcproj/login-server_txt.vcproj

@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="login-server_txt"
-	ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-login"
-			IntermediateDirectory="Debug-login"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\login-server.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-login"
-			IntermediateDirectory="Release-login"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\login-server.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\login\login.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\login\md5calc.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="login-server_txt"
+	ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-login"
+			IntermediateDirectory="Debug-login"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\login-server.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-login"
+			IntermediateDirectory="Release-login"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\login-server.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\login\login.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\login\md5calc.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 382 - 382
vcproj/map-server_sql.vcproj

@@ -1,382 +1,382 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="map-server_sql"
-	ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-sqlmap"
-			IntermediateDirectory="Debug-sqlmap"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
-				OutputFile="..\map-server_sql.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\map-server_sql.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-sqlmap"
-			IntermediateDirectory="Release-sqlmap"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="1"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
-				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
-				OutputFile="..\map-server_sql.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\zlib\adler32.c">
-			</File>
-			<File
-				RelativePath="..\src\map\atcommand.c">
-			</File>
-			<File
-				RelativePath="..\src\map\battle.c">
-			</File>
-			<File
-				RelativePath="..\src\map\charcommand.c">
-			</File>
-			<File
-				RelativePath="..\src\map\chat.c">
-			</File>
-			<File
-				RelativePath="..\src\map\chrif.c">
-			</File>
-			<File
-				RelativePath="..\src\map\clif.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\compress.c">
-			</File>
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\crc32.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\deflate.c">
-			</File>
-			<File
-				RelativePath="..\src\common\grfio.c">
-			</File>
-			<File
-				RelativePath="..\src\map\guild.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inffast.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inflate.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inftrees.c">
-			</File>
-			<File
-				RelativePath="..\src\map\intif.c">
-			</File>
-			<File
-				RelativePath="..\src\map\itemdb.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\map\log.c">
-			</File>
-			<File
-				RelativePath="..\src\map\mail.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\map.c">
-			</File>
-			<File
-				RelativePath="..\src\map\mob.c">
-			</File>
-			<File
-				RelativePath="..\src\map\npc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\npc_chat.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\map\party.c">
-			</File>
-			<File
-				RelativePath="..\src\map\path.c">
-			</File>
-			<File
-				RelativePath="..\src\map\pc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\pet.c">
-			</File>
-			<File
-				RelativePath="..\src\map\script.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\map\skill.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\map\status.c">
-			</File>
-			<File
-				RelativePath="..\src\map\storage.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\map\trade.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\trees.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-			<File
-				RelativePath="..\src\map\vending.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\zutil.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\src\map\atcommand.h">
-			</File>
-			<File
-				RelativePath="..\src\map\battle.h">
-			</File>
-			<File
-				RelativePath="..\src\common\buffer.h">
-			</File>
-			<File
-				RelativePath="..\src\map\charcommand.h">
-			</File>
-			<File
-				RelativePath="..\src\map\chat.h">
-			</File>
-			<File
-				RelativePath="..\src\map\chrif.h">
-			</File>
-			<File
-				RelativePath="..\src\map\clif.h">
-			</File>
-			<File
-				RelativePath="..\src\common\core.h">
-			</File>
-			<File
-				RelativePath="..\src\common\db.h">
-			</File>
-			<File
-				RelativePath="..\src\common\grfio.h">
-			</File>
-			<File
-				RelativePath="..\src\map\guild.h">
-			</File>
-			<File
-				RelativePath="..\src\map\intif.h">
-			</File>
-			<File
-				RelativePath="..\src\map\itemdb.h">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.h">
-			</File>
-			<File
-				RelativePath="..\src\map\log.h">
-			</File>
-			<File
-				RelativePath="..\src\map\mail.h">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.h">
-			</File>
-			<File
-				RelativePath="..\src\map\map.h">
-			</File>
-			<File
-				RelativePath="..\src\common\mmo.h">
-			</File>
-			<File
-				RelativePath="..\src\map\mob.h">
-			</File>
-			<File
-				RelativePath="..\src\map\npc.h">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.h">
-			</File>
-			<File
-				RelativePath="..\src\map\party.h">
-			</File>
-			<File
-				RelativePath="..\src\map\pc.h">
-			</File>
-			<File
-				RelativePath="..\src\map\pet.h">
-			</File>
-			<File
-				RelativePath="..\src\map\script.h">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.h">
-			</File>
-			<File
-				RelativePath="..\src\map\skill.h">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.h">
-			</File>
-			<File
-				RelativePath="..\src\map\status.h">
-			</File>
-			<File
-				RelativePath="..\src\map\storage.h">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.h">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.h">
-			</File>
-			<File
-				RelativePath="..\src\map\trade.h">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.h">
-			</File>
-			<File
-				RelativePath="..\src\map\vending.h">
-			</File>
-			<File
-				RelativePath="..\src\common\version.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="map-server_sql"
+	ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-sqlmap"
+			IntermediateDirectory="Debug-sqlmap"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				OutputFile="..\map-server_sql.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\map-server_sql.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-sqlmap"
+			IntermediateDirectory="Release-sqlmap"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				OutputFile="..\map-server_sql.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\zlib\adler32.c">
+			</File>
+			<File
+				RelativePath="..\src\map\atcommand.c">
+			</File>
+			<File
+				RelativePath="..\src\map\battle.c">
+			</File>
+			<File
+				RelativePath="..\src\map\charcommand.c">
+			</File>
+			<File
+				RelativePath="..\src\map\chat.c">
+			</File>
+			<File
+				RelativePath="..\src\map\chrif.c">
+			</File>
+			<File
+				RelativePath="..\src\map\clif.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\compress.c">
+			</File>
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\crc32.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\deflate.c">
+			</File>
+			<File
+				RelativePath="..\src\common\grfio.c">
+			</File>
+			<File
+				RelativePath="..\src\map\guild.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inffast.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inflate.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inftrees.c">
+			</File>
+			<File
+				RelativePath="..\src\map\intif.c">
+			</File>
+			<File
+				RelativePath="..\src\map\itemdb.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\map\log.c">
+			</File>
+			<File
+				RelativePath="..\src\map\mail.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\map.c">
+			</File>
+			<File
+				RelativePath="..\src\map\mob.c">
+			</File>
+			<File
+				RelativePath="..\src\map\npc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\npc_chat.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\map\party.c">
+			</File>
+			<File
+				RelativePath="..\src\map\path.c">
+			</File>
+			<File
+				RelativePath="..\src\map\pc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\pet.c">
+			</File>
+			<File
+				RelativePath="..\src\map\script.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\map\skill.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\map\status.c">
+			</File>
+			<File
+				RelativePath="..\src\map\storage.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\map\trade.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\trees.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+			<File
+				RelativePath="..\src\map\vending.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\zutil.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\src\map\atcommand.h">
+			</File>
+			<File
+				RelativePath="..\src\map\battle.h">
+			</File>
+			<File
+				RelativePath="..\src\common\buffer.h">
+			</File>
+			<File
+				RelativePath="..\src\map\charcommand.h">
+			</File>
+			<File
+				RelativePath="..\src\map\chat.h">
+			</File>
+			<File
+				RelativePath="..\src\map\chrif.h">
+			</File>
+			<File
+				RelativePath="..\src\map\clif.h">
+			</File>
+			<File
+				RelativePath="..\src\common\core.h">
+			</File>
+			<File
+				RelativePath="..\src\common\db.h">
+			</File>
+			<File
+				RelativePath="..\src\common\grfio.h">
+			</File>
+			<File
+				RelativePath="..\src\map\guild.h">
+			</File>
+			<File
+				RelativePath="..\src\map\intif.h">
+			</File>
+			<File
+				RelativePath="..\src\map\itemdb.h">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.h">
+			</File>
+			<File
+				RelativePath="..\src\map\log.h">
+			</File>
+			<File
+				RelativePath="..\src\map\mail.h">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.h">
+			</File>
+			<File
+				RelativePath="..\src\map\map.h">
+			</File>
+			<File
+				RelativePath="..\src\common\mmo.h">
+			</File>
+			<File
+				RelativePath="..\src\map\mob.h">
+			</File>
+			<File
+				RelativePath="..\src\map\npc.h">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.h">
+			</File>
+			<File
+				RelativePath="..\src\map\party.h">
+			</File>
+			<File
+				RelativePath="..\src\map\pc.h">
+			</File>
+			<File
+				RelativePath="..\src\map\pet.h">
+			</File>
+			<File
+				RelativePath="..\src\map\script.h">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.h">
+			</File>
+			<File
+				RelativePath="..\src\map\skill.h">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.h">
+			</File>
+			<File
+				RelativePath="..\src\map\status.h">
+			</File>
+			<File
+				RelativePath="..\src\map\storage.h">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.h">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.h">
+			</File>
+			<File
+				RelativePath="..\src\map\trade.h">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.h">
+			</File>
+			<File
+				RelativePath="..\src\map\vending.h">
+			</File>
+			<File
+				RelativePath="..\src\common\version.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 381 - 381
vcproj/map-server_txt.vcproj

@@ -1,381 +1,381 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="map-server_txt"
-	ProjectGUID="{D356871D-58E1-450B-967A-E1E9646175AF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug-map"
-			IntermediateDirectory="Debug-map"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FIXED:NO"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\map-server.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release-map"
-			IntermediateDirectory="Release-map"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
-				OutputFile="..\map-server.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\src\zlib\adler32.c">
-			</File>
-			<File
-				RelativePath="..\src\map\atcommand.c">
-			</File>
-			<File
-				RelativePath="..\src\map\battle.c">
-			</File>
-			<File
-				RelativePath="..\src\map\charcommand.c">
-			</File>
-			<File
-				RelativePath="..\src\map\chat.c">
-			</File>
-			<File
-				RelativePath="..\src\map\chrif.c">
-			</File>
-			<File
-				RelativePath="..\src\map\clif.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\compress.c">
-			</File>
-			<File
-				RelativePath="..\src\common\core.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\crc32.c">
-			</File>
-			<File
-				RelativePath="..\src\common\db.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\deflate.c">
-			</File>
-			<File
-				RelativePath="..\src\common\grfio.c">
-			</File>
-			<File
-				RelativePath="..\src\map\guild.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inffast.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inflate.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\inftrees.c">
-			</File>
-			<File
-				RelativePath="..\src\map\intif.c">
-			</File>
-			<File
-				RelativePath="..\src\map\itemdb.c">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c">
-			</File>
-			<File
-				RelativePath="..\src\map\log.c">
-			</File>
-			<File
-				RelativePath="..\src\map\mail.c">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\map.c">
-			</File>
-			<File
-				RelativePath="..\src\map\mob.c">
-			</File>
-			<File
-				RelativePath="..\src\map\npc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\npc_chat.c">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c">
-			</File>
-			<File
-				RelativePath="..\src\map\party.c">
-			</File>
-			<File
-				RelativePath="..\src\map\path.c">
-			</File>
-			<File
-				RelativePath="..\src\map\pc.c">
-			</File>
-			<File
-				RelativePath="..\src\map\pet.c">
-			</File>
-			<File
-				RelativePath="..\src\map\script.c">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c">
-			</File>
-			<File
-				RelativePath="..\src\map\skill.c">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c">
-			</File>
-			<File
-				RelativePath="..\src\map\status.c">
-			</File>
-			<File
-				RelativePath="..\src\map\storage.c">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c">
-			</File>
-			<File
-				RelativePath="..\src\map\trade.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\trees.c">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c">
-			</File>
-			<File
-				RelativePath="..\src\map\vending.c">
-			</File>
-			<File
-				RelativePath="..\src\zlib\zutil.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\src\map\atcommand.h">
-			</File>
-			<File
-				RelativePath="..\src\map\battle.h">
-			</File>
-			<File
-				RelativePath="..\src\common\buffer.h">
-			</File>
-			<File
-				RelativePath="..\src\map\charcommand.h">
-			</File>
-			<File
-				RelativePath="..\src\map\chat.h">
-			</File>
-			<File
-				RelativePath="..\src\map\chrif.h">
-			</File>
-			<File
-				RelativePath="..\src\map\clif.h">
-			</File>
-			<File
-				RelativePath="..\src\common\core.h">
-			</File>
-			<File
-				RelativePath="..\src\common\db.h">
-			</File>
-			<File
-				RelativePath="..\src\common\grfio.h">
-			</File>
-			<File
-				RelativePath="..\src\map\guild.h">
-			</File>
-			<File
-				RelativePath="..\src\map\intif.h">
-			</File>
-			<File
-				RelativePath="..\src\map\itemdb.h">
-			</File>
-			<File
-				RelativePath="..\src\common\lock.h">
-			</File>
-			<File
-				RelativePath="..\src\map\log.h">
-			</File>
-			<File
-				RelativePath="..\src\map\mail.h">
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.h">
-			</File>
-			<File
-				RelativePath="..\src\map\map.h">
-			</File>
-			<File
-				RelativePath="..\src\common\mmo.h">
-			</File>
-			<File
-				RelativePath="..\src\map\mob.h">
-			</File>
-			<File
-				RelativePath="..\src\map\npc.h">
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.h">
-			</File>
-			<File
-				RelativePath="..\src\map\party.h">
-			</File>
-			<File
-				RelativePath="..\src\map\pc.h">
-			</File>
-			<File
-				RelativePath="..\src\map\pet.h">
-			</File>
-			<File
-				RelativePath="..\src\map\script.h">
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.h">
-			</File>
-			<File
-				RelativePath="..\src\map\skill.h">
-			</File>
-			<File
-				RelativePath="..\src\common\socket.h">
-			</File>
-			<File
-				RelativePath="..\src\map\status.h">
-			</File>
-			<File
-				RelativePath="..\src\map\storage.h">
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.h">
-			</File>
-			<File
-				RelativePath="..\src\common\timer.h">
-			</File>
-			<File
-				RelativePath="..\src\map\trade.h">
-			</File>
-			<File
-				RelativePath="..\src\common\utils.h">
-			</File>
-			<File
-				RelativePath="..\src\map\vending.h">
-			</File>
-			<File
-				RelativePath="..\src\common\version.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="map-server_txt"
+	ProjectGUID="{D356871D-58E1-450B-967A-E1E9646175AF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug-map"
+			IntermediateDirectory="Debug-map"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/FIXED:NO"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\map-server.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release-map"
+			IntermediateDirectory="Release-map"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\map-server.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\zlib\adler32.c">
+			</File>
+			<File
+				RelativePath="..\src\map\atcommand.c">
+			</File>
+			<File
+				RelativePath="..\src\map\battle.c">
+			</File>
+			<File
+				RelativePath="..\src\map\charcommand.c">
+			</File>
+			<File
+				RelativePath="..\src\map\chat.c">
+			</File>
+			<File
+				RelativePath="..\src\map\chrif.c">
+			</File>
+			<File
+				RelativePath="..\src\map\clif.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\compress.c">
+			</File>
+			<File
+				RelativePath="..\src\common\core.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\crc32.c">
+			</File>
+			<File
+				RelativePath="..\src\common\db.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\deflate.c">
+			</File>
+			<File
+				RelativePath="..\src\common\grfio.c">
+			</File>
+			<File
+				RelativePath="..\src\map\guild.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inffast.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inflate.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\inftrees.c">
+			</File>
+			<File
+				RelativePath="..\src\map\intif.c">
+			</File>
+			<File
+				RelativePath="..\src\map\itemdb.c">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.c">
+			</File>
+			<File
+				RelativePath="..\src\map\log.c">
+			</File>
+			<File
+				RelativePath="..\src\map\mail.c">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\map.c">
+			</File>
+			<File
+				RelativePath="..\src\map\mob.c">
+			</File>
+			<File
+				RelativePath="..\src\map\npc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\npc_chat.c">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.c">
+			</File>
+			<File
+				RelativePath="..\src\map\party.c">
+			</File>
+			<File
+				RelativePath="..\src\map\path.c">
+			</File>
+			<File
+				RelativePath="..\src\map\pc.c">
+			</File>
+			<File
+				RelativePath="..\src\map\pet.c">
+			</File>
+			<File
+				RelativePath="..\src\map\script.c">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.c">
+			</File>
+			<File
+				RelativePath="..\src\map\skill.c">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.c">
+			</File>
+			<File
+				RelativePath="..\src\map\status.c">
+			</File>
+			<File
+				RelativePath="..\src\map\storage.c">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.c">
+			</File>
+			<File
+				RelativePath="..\src\map\trade.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\trees.c">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.c">
+			</File>
+			<File
+				RelativePath="..\src\map\vending.c">
+			</File>
+			<File
+				RelativePath="..\src\zlib\zutil.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\src\map\atcommand.h">
+			</File>
+			<File
+				RelativePath="..\src\map\battle.h">
+			</File>
+			<File
+				RelativePath="..\src\common\buffer.h">
+			</File>
+			<File
+				RelativePath="..\src\map\charcommand.h">
+			</File>
+			<File
+				RelativePath="..\src\map\chat.h">
+			</File>
+			<File
+				RelativePath="..\src\map\chrif.h">
+			</File>
+			<File
+				RelativePath="..\src\map\clif.h">
+			</File>
+			<File
+				RelativePath="..\src\common\core.h">
+			</File>
+			<File
+				RelativePath="..\src\common\db.h">
+			</File>
+			<File
+				RelativePath="..\src\common\grfio.h">
+			</File>
+			<File
+				RelativePath="..\src\map\guild.h">
+			</File>
+			<File
+				RelativePath="..\src\map\intif.h">
+			</File>
+			<File
+				RelativePath="..\src\map\itemdb.h">
+			</File>
+			<File
+				RelativePath="..\src\common\lock.h">
+			</File>
+			<File
+				RelativePath="..\src\map\log.h">
+			</File>
+			<File
+				RelativePath="..\src\map\mail.h">
+			</File>
+			<File
+				RelativePath="..\src\common\malloc.h">
+			</File>
+			<File
+				RelativePath="..\src\map\map.h">
+			</File>
+			<File
+				RelativePath="..\src\common\mmo.h">
+			</File>
+			<File
+				RelativePath="..\src\map\mob.h">
+			</File>
+			<File
+				RelativePath="..\src\map\npc.h">
+			</File>
+			<File
+				RelativePath="..\src\common\nullpo.h">
+			</File>
+			<File
+				RelativePath="..\src\map\party.h">
+			</File>
+			<File
+				RelativePath="..\src\map\pc.h">
+			</File>
+			<File
+				RelativePath="..\src\map\pet.h">
+			</File>
+			<File
+				RelativePath="..\src\map\script.h">
+			</File>
+			<File
+				RelativePath="..\src\common\showmsg.h">
+			</File>
+			<File
+				RelativePath="..\src\map\skill.h">
+			</File>
+			<File
+				RelativePath="..\src\common\socket.h">
+			</File>
+			<File
+				RelativePath="..\src\map\status.h">
+			</File>
+			<File
+				RelativePath="..\src\map\storage.h">
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.h">
+			</File>
+			<File
+				RelativePath="..\src\common\timer.h">
+			</File>
+			<File
+				RelativePath="..\src\map\trade.h">
+			</File>
+			<File
+				RelativePath="..\src\common\utils.h">
+			</File>
+			<File
+				RelativePath="..\src\map\vending.h">
+			</File>
+			<File
+				RelativePath="..\src\common\version.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>