- Changes in the VS8 project files:

  * synchronized the settings between the projects
  * joined all .h and .cpp files and grouped them based on the src subfolder (easier to understand how the source is organized)
  * added Debug/Release build targets that build txt/sql only
  * other minor changes

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9758 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 558 insertions, 402 deletions

diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 206677f97..280e59105 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-sqlchar"
-			IntermediateDirectory="Debug-sqlchar"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -45,6 +45,7 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
+				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -67,13 +68,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="../char-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -104,8 +105,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-sqlchar"
-			IntermediateDirectory="Release-sqlchar"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -127,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
+				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -156,13 +157,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="../char-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -199,16 +200,14 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="common"
 			>
 			<File
-				RelativePath="..\src\char_sql\char.c"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.c"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
@@ -216,6 +215,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\db.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\ers.c"
 				>
 			</File>
@@ -224,63 +227,63 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_guild.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_homun.c"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_party.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_pet.c"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_storage.c"
+				RelativePath="..\src\common\malloc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\inter.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\itemdb.c"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.c"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.c"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.c"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
@@ -288,119 +291,143 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\socket.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\strlib.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
 				RelativePath="..\src\common\utils.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\version.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
+			Name="zlib"
 			>
 			<File
-				RelativePath="..\src\char_sql\char.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_guild.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_homun.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_party.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_pet.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_storage.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="char_sql"
+			>
 			<File
-				RelativePath="..\src\char_sql\inter.h"
+				RelativePath="..\src\char_sql\char.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\itemdb.h"
+				RelativePath="..\src\char_sql\char.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\char_sql\int_guild.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\char_sql\int_guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\char_sql\int_homun.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\char_sql\int_homun.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\char_sql\int_party.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\char_sql\int_party.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\char_sql\int_pet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\char_sql\int_pet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\char_sql\int_storage.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\char_sql\int_storage.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\char_sql\inter.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\char_sql\inter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\char_sql\itemdb.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char_sql\itemdb.h"
 				>
 			</File>
 		</Filter>
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index 625cd330d..b42153d6c 100644
--- a/vcproj-8/char-server_txt.vcproj
+++ b/vcproj-8/char-server_txt.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-char"
-			IntermediateDirectory="Debug-char"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -45,6 +45,7 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
+				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -67,12 +68,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
-				OutputFile="..\char-server.exe"
+				OutputFile="$(OutDir)\char-server.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\char-server.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -103,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-char"
-			IntermediateDirectory="Release-char"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -126,7 +127,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
+				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -156,12 +157,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
-				OutputFile="..\char-server.exe"
+				OutputFile="$(OutDir)\char-server.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\char-server.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -198,44 +199,42 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="char_txt"
 			>
 			<File
 				RelativePath="..\src\char\char.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.c"
+				RelativePath="..\src\char\char.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.c"
+				RelativePath="..\src\char\int_guild.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.c"
+				RelativePath="..\src\char\int_guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.c"
+				RelativePath="..\src\char\int_homun.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_guild.c"
+				RelativePath="..\src\char\int_party.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_homun.c"
+				RelativePath="..\src\char\int_party.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_party.c"
+				RelativePath="..\src\char\int_pet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_pet.c"
+				RelativePath="..\src\char\int_pet.h"
 				>
 			</File>
 			<File
@@ -243,159 +242,187 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\char\int_status.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\char\int_storage.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\char\int_storage.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\char\inter.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\char\inter.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="common"
+			>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.c"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.c"
+				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.c"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.c"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\common\malloc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
 			<File
-				RelativePath="..\src\char\char.h"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_guild.h"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_party.h"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_pet.h"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_status.h"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\int_storage.h"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char\inter.h"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\common\socket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\common\utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\common\version.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="zlib"
+			>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\zlib\iowin32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zlib\unzip.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zlib\unzip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zlib\zconf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index 18945ad14..1640c110a 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-sqllogin"
-			IntermediateDirectory="Debug-sqllogin"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -45,8 +45,10 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
+				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="true"
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -66,13 +68,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="..\login-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
-				IgnoreDefaultLibraryNames="LIBCMT"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -103,8 +105,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-sqllogin"
-			IntermediateDirectory="Release-sqllogin"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -126,10 +128,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				RuntimeLibrary="0"
@@ -154,16 +159,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="..\login-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -196,32 +202,46 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="login_sql"
+			>
+			<File
+				RelativePath="..\src\login_sql\login.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\login_sql\login.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="common"
 			>
 			<File
 				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\core.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.c"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.c"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
@@ -229,7 +249,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\login_sql\login.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
@@ -237,111 +257,123 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\malloc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\md5calc.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\md5calc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\mmo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.c"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.c"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\common\socket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\login_sql\login.h"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h"
+				RelativePath="..\src\common\utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\common\version.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="zlib"
+			>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index 046b50a1e..622ee0db6 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-login"
-			IntermediateDirectory="Debug-login"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -44,18 +44,13 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
+				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
 				DefaultCharIsUnsigned="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				WarnAsError="false"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
@@ -73,12 +68,12 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
 				ShowProgress="0"
-				OutputFile="..\login-server.exe"
+				OutputFile="$(OutDir)\login-server.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\login-server.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -109,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-login"
-			IntermediateDirectory="Release-login"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -162,15 +157,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
-				OutputFile="..\login-server.exe"
+				OutputFile="$(OutDir)\login-server.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\login-server.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -203,32 +199,46 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="login_txt"
+			>
+			<File
+				RelativePath="..\src\login\login.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\login\login.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="common"
 			>
 			<File
 				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\core.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.c"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.c"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
@@ -236,7 +246,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\login\login.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
@@ -244,111 +254,123 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\malloc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\md5calc.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\md5calc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\mmo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.c"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.c"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\common\socket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\login\login.h"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h"
+				RelativePath="..\src\common\utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\common\version.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="zlib"
+			>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index 1bf2c0b73..a75bee2f5 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-sqlmap"
-			IntermediateDirectory="Debug-sqlmap"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -44,6 +44,7 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
+				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -51,7 +52,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
 			<Tool
@@ -66,13 +67,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -103,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-sqlmap"
-			IntermediateDirectory="Release-sqlmap"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -127,12 +128,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
+				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				RuntimeLibrary="2"
@@ -155,16 +157,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -197,228 +200,230 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="common"
 			>
 			<File
-				RelativePath="..\src\map\atcommand.c"
+				RelativePath="..\src\common\cbasetypes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\battle.c"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charcommand.c"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charsave.c"
+				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chat.c"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chrif.c"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\clif.c"
+				RelativePath="..\src\common\ers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.c"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\date.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.c"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.c"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\guild.c"
+				RelativePath="..\src\common\malloc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\intif.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\irc.c"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\itemdb.c"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.c"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\log.c"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mail.c"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.c"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\map.c"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mercenary.c"
+				RelativePath="..\src\common\socket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mob.c"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\npc.c"
+				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\npc_chat.c"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.c"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\party.c"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\path.c"
+				RelativePath="..\src\common\utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\pc.c"
+				RelativePath="..\src\common\version.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="zlib"
+			>
 			<File
-				RelativePath="..\src\map\pet.c"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\script.c"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\skill.c"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\status.c"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\storage.c"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.c"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="map_sql"
+			>
 			<File
-				RelativePath="..\src\common\timer.c"
+				RelativePath="..\src\map\atcommand.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\trade.c"
+				RelativePath="..\src\map\atcommand.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\unit.c"
+				RelativePath="..\src\map\battle.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\map\battle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\map\charcommand.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\vending.c"
+				RelativePath="..\src\map\charcommand.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
 			<File
-				RelativePath="..\src\map\atcommand.h"
+				RelativePath="..\src\map\charsave.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\battle.h"
+				RelativePath="..\src\map\charsave.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\cbasetypes.h"
+				RelativePath="..\src\map\chat.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charcommand.h"
+				RelativePath="..\src\map\chat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charsave.h"
+				RelativePath="..\src\map\chrif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chat.h"
+				RelativePath="..\src\map\chrif.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chrif.h"
+				RelativePath="..\src\map\clif.c"
 				>
 			</File>
 			<File
@@ -426,7 +431,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\map\date.c"
 				>
 			</File>
 			<File
@@ -434,23 +439,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\map\guild.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.h"
+				RelativePath="..\src\map\guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\map\intif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\guild.h"
+				RelativePath="..\src\map\intif.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\intif.h"
+				RelativePath="..\src\map\irc.c"
 				>
 			</File>
 			<File
@@ -458,15 +463,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\itemdb.h"
+				RelativePath="..\src\map\itemdb.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\limits.h"
+				RelativePath="..\src\map\itemdb.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\map\log.c"
 				>
 			</File>
 			<File
@@ -474,11 +479,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\mail.c"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\mail.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\map\map.c"
 				>
 			</File>
 			<File
@@ -486,7 +495,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\map\mercenary.c"
 				>
 			</File>
 			<File
@@ -494,7 +503,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\map\mob.c"
 				>
 			</File>
 			<File
@@ -502,11 +511,19 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\npc.c"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\npc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\map\npc_chat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\map\party.c"
 				>
 			</File>
 			<File
@@ -514,6 +531,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\map\pc.c"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\pc.h"
 				>
 			</File>
@@ -522,15 +547,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\pet.h"
+				RelativePath="..\src\map\pet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\map\pet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\map\script.c"
 				>
 			</File>
 			<File
@@ -538,7 +563,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\map\skill.c"
 				>
 			</File>
 			<File
@@ -546,7 +571,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\map\status.c"
 				>
 			</File>
 			<File
@@ -554,15 +579,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\storage.h"
+				RelativePath="..\src\map\storage.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\map\storage.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\map\trade.c"
 				>
 			</File>
 			<File
@@ -570,19 +595,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\unit.h"
+				RelativePath="..\src\map\unit.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\map\unit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\vending.h"
+				RelativePath="..\src\map\vending.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\map\vending.h"
 				>
 			</File>
 		</Filter>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 9a64836cf..c899a1cac 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-map"
-			IntermediateDirectory="Debug-map"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -49,7 +49,6 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				DefaultCharIsUnsigned="false"
-				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -69,12 +68,12 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server.exe"
+				OutputFile="$(OutDir)\map-server.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -105,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-map"
-			IntermediateDirectory="Release-map"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -134,6 +133,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\src\common;..\src\zlib"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="true"
@@ -158,15 +158,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server.exe"
+				OutputFile="$(OutDir)\map-server.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\map-server.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -199,56 +200,70 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="map_txt"
 			>
 			<File
 				RelativePath="..\src\map\atcommand.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\atcommand.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\battle.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\battle.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\charcommand.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\charcommand.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\charsave.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\charsave.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\chat.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chrif.c"
+				RelativePath="..\src\map\chat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\clif.c"
+				RelativePath="..\src\map\chrif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.c"
+				RelativePath="..\src\map\chrif.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\date.c"
+				RelativePath="..\src\map\clif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.c"
+				RelativePath="..\src\map\clif.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.c"
+				RelativePath="..\src\map\date.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.c"
+				RelativePath="..\src\map\date.h"
 				>
 			</File>
 			<File
@@ -256,15 +271,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\intif.c"
+				RelativePath="..\src\map\guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\map\intif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\map\intif.h"
 				>
 			</File>
 			<File
@@ -272,11 +287,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\irc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\itemdb.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.c"
+				RelativePath="..\src\map\itemdb.h"
 				>
 			</File>
 			<File
@@ -284,11 +303,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\log.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\mail.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.c"
+				RelativePath="..\src\map\mail.h"
 				>
 			</File>
 			<File
@@ -296,7 +319,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\map\map.h"
 				>
 			</File>
 			<File
@@ -304,19 +327,27 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\mercenary.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\mob.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\mob.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\npc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\npc_chat.c"
+				RelativePath="..\src\map\npc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.c"
+				RelativePath="..\src\map\npc_chat.c"
 				>
 			</File>
 			<File
@@ -324,6 +355,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\party.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\path.c"
 				>
 			</File>
@@ -332,11 +367,19 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\pc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\map\pcre.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\pet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\map\pet.h"
 				>
 			</File>
 			<File
@@ -344,7 +387,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\map\script.h"
 				>
 			</File>
 			<File
@@ -352,7 +395,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\map\skill.h"
 				>
 			</File>
 			<File
@@ -360,15 +403,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\storage.c"
+				RelativePath="..\src\map\status.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.c"
+				RelativePath="..\src\map\storage.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.c"
+				RelativePath="..\src\map\storage.h"
 				>
 			</File>
 			<File
@@ -376,107 +419,115 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\unit.c"
+				RelativePath="..\src\map\trade.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\map\unit.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\map\unit.h"
 				>
 			</File>
 			<File
 				RelativePath="..\src\map\vending.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\map\vending.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
+			Name="zlib"
 			>
 			<File
-				RelativePath="..\src\map\atcommand.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\battle.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\cbasetypes.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charcommand.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charsave.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chat.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chrif.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\clif.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="common"
+			>
 			<File
-				RelativePath="..\src\map\date.h"
+				RelativePath="..\src\common\cbasetypes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.h"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\guild.h"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\intif.h"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\irc.h"
+				RelativePath="..\src\common\ers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\itemdb.h"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\limits.h"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\log.h"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mail.h"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
@@ -484,7 +535,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\map.h"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
@@ -492,19 +543,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mercenary.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\npc.h"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
@@ -512,23 +555,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\party.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pcre.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pet.h"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
@@ -536,7 +567,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\script.h"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
@@ -544,7 +575,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\skill.h"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
 			<File
@@ -552,11 +583,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\status.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\storage.h"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
@@ -564,15 +591,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\trade.h"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\unit.h"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
@@ -580,10 +607,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\vending.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\common\version.h"
 				>
 			</File>