* Fixed various sorts of issues with VS6 project files (since r6929, follow up to r14466 and r14638).

- Debug configuration was missing and release had _DEBUG defined (indicates debug configuration).
- Login-server (SQL) defined PACKETVER=6 (overrides mmo.h).
- Warning Level was 2, which hides a lot of actual errors.
- Added projects for mapcache and TXT converter.
- Removed references unneeded/obsolete libraries/source files.

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

13 files changed, 1374 insertions, 231 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index af6c32505..138642b15 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,12 @@
 Date	Added
 
+2011/06/19
+	* Fixed various sorts of issues with VS6 project files (since r6929, follow up to r14466 and r14638). [Ai4rei]
+	- Debug configuration was missing and release had _DEBUG defined (indicates debug configuration).
+	- Login-server (SQL) defined PACKETVER=6 (overrides mmo.h).
+	- Warning Level was 2, which hides a lot of actual errors.
+	- Added projects for mapcache and TXT converter.
+	- Removed references unneeded/obsolete libraries/source files.
 2011/06/18
 	* Fixed using @refresh while having vending or buyingstore open would stuck the character (bugreport:156 , since r1307). [Ai4rei]
 	* Fixed missing strlib.h include for compilers without own 'strnlen' implementation (since r14853). [Ai4rei]
diff --git a/eAthena-6.dsw b/eAthena-6.dsw
index 941ed90bc..ffacdb23c 100644
--- a/eAthena-6.dsw
+++ b/eAthena-6.dsw
@@ -3,7 +3,19 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "login_txt"=".\vcproj-6\login-server_txt.dsp" - Package Owner=<4>
+Project: "char_sql"=".\vcproj-6\char-server_sql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "char_txt"=".\vcproj-6\char-server_txt.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -27,7 +39,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "char_txt"=".\vcproj-6\char-server_txt.dsp" - Package Owner=<4>
+Project: "login_txt"=".\vcproj-6\login-server_txt.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,7 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "char_sql"=".\vcproj-6\char-server_sql.dsp" - Package Owner=<4>
+Project: "map_sql"=".\vcproj-6\map-server_sql.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -63,7 +75,31 @@ Package=<4>
 
 ###############################################################################
 
-Project: "map_sql"=".\vcproj-6\map-server_sql.dsp" - Package Owner=<4>
+Project: "mapcache"=".\vcproj-6\mapcache.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "plugin_console"=".\vcproj-6\plugin-console.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "plugin_pid"=".\vcproj-6\plugin-pid.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -75,7 +111,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "console"=".\vcproj-6\plugin-console.dsp" - Package Owner=<4>
+Project: "txt_converter_char"=".\vcproj-6\txt-converter-char.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -87,7 +123,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "pid"=".\vcproj-6\plugin-pid.dsp" - Package Owner=<4>
+Project: "txt_converter_login"=".\vcproj-6\txt-converter-login.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/vcproj-6/char-server_sql.dsp b/vcproj-6/char-server_sql.dsp
index f055ec3bc..c87298481 100644
--- a/vcproj-6/char-server_sql.dsp
+++ b/vcproj-6/char-server_sql.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=char_sql - Win32 Release
+CFG=char_sql - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=char_sql - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "char-server_sql.mak" CFG="char_sql - Win32 Release"
+!MESSAGE NMAKE /f "char-server_sql.mak" CFG="char_sql - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "char_sql - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "char_sql - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=char_sql - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "char_sql - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\char_sql\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 wsock32.lib libmysql.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/char_sql/char-server_sql.pdb" /machine:I386 /out:"../char-server_sql.exe" /libpath:"..\3rdparty\mysql\lib"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\mysql\lib"
+
+!ELSEIF  "$(CFG)" == "char_sql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\char_sql\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib"
+
+!ENDIF 
+
 # Begin Target
 
 # Name "char_sql - Win32 Release"
+# Name "char_sql - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -83,14 +117,6 @@ SOURCE=..\src\common\ers.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\common\lock.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\malloc.c
 # End Source File
 # Begin Source File
@@ -219,19 +245,19 @@ SOURCE=..\src\char_sql\int_homun.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\char_sql\int_mercenary.c
+SOURCE=..\src\char_sql\int_mail.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\char_sql\int_mercenary.h
+SOURCE=..\src\char_sql\int_mail.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\char_sql\int_mail.c
+SOURCE=..\src\char_sql\int_mercenary.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\char_sql\int_mail.h
+SOURCE=..\src\char_sql\int_mercenary.h
 # End Source File
 # Begin Source File
 
diff --git a/vcproj-6/char-server_txt.dsp b/vcproj-6/char-server_txt.dsp
index 975f7cf8f..bcd522b6e 100644
--- a/vcproj-6/char-server_txt.dsp
+++ b/vcproj-6/char-server_txt.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=char_txt - Win32 Release
+CFG=char_txt - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=char_txt - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "char-server_txt.mak" CFG="char_txt - Win32 Release"
+!MESSAGE NMAKE /f "char-server_txt.mak" CFG="char_txt - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "char_txt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "char_txt - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=char_txt - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "char_txt - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\char_txt\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "TXT_ONLY" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 wsock32.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/char-txt/char-server_txt.pdb" /machine:I386 /out:"../char-server_txt.exe"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386
+
+!ELSEIF  "$(CFG)" == "char_txt - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\char_txt\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "TXT_ONLY" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
 # Begin Target
 
 # Name "char_txt - Win32 Release"
+# Name "char_txt - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -174,7 +208,7 @@ SOURCE=..\src\common\utils.h
 SOURCE=..\src\common\version.h
 # End Source File
 # End Group
-# Begin Group "char"
+# Begin Group "char_txt"
 
 # PROP Default_Filter ""
 # Begin Source File
diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp
index 0a52185e1..39bed2a9b 100644
--- a/vcproj-6/login-server_sql.dsp
+++ b/vcproj-6/login-server_sql.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=login_sql - Win32 Release
+CFG=login_sql - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=login_sql - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Release"
+!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "login_sql - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "login_sql - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=login_sql - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "login_sql - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\login_sql\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 WSOCK32.lib libmysql.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_sql/login-server_sql.pdb" /machine:I386 /out:"../login-server_sql.exe" /libpath:"..\3rdparty\mysql\lib"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\mysql\lib"
+
+!ELSEIF  "$(CFG)" == "login_sql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\login_sql\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib"
+
+!ENDIF 
+
 # Begin Target
 
 # Name "login_sql - Win32 Release"
+# Name "login_sql - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -83,14 +117,6 @@ SOURCE=..\src\common\ers.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\common\lock.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\malloc.c
 # End Source File
 # Begin Source File
@@ -171,10 +197,6 @@ SOURCE=..\src\common\strlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\timer.c
 # End Source File
 # Begin Source File
diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp
index ecb083269..0ed85373c 100644
--- a/vcproj-6/login-server_txt.dsp
+++ b/vcproj-6/login-server_txt.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=login_txt - Win32 Release
+CFG=login_txt - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=login_txt - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "login-server_txt.mak" CFG="login_txt - Win32 Release"
+!MESSAGE NMAKE /f "login-server_txt.mak" CFG="login_txt - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "login_txt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "login_txt - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=login_txt - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "login_txt - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\login_txt\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 WSOCK32.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_txt/login-server_txt.pdb" /machine:I386 /out:"../login-server_txt.exe"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386
+
+!ELSEIF  "$(CFG)" == "login_txt - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\login_txt\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
 # Begin Target
 
 # Name "login_txt - Win32 Release"
+# Name "login_txt - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -111,6 +145,10 @@ SOURCE=..\src\common\md5calc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\common\md5calc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\common\mmo.h
 # End Source File
 # Begin Source File
@@ -159,10 +197,6 @@ SOURCE=..\src\common\strlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\timer.c
 # End Source File
 # Begin Source File
@@ -182,7 +216,7 @@ SOURCE=..\src\common\utils.h
 SOURCE=..\src\common\version.h
 # End Source File
 # End Group
-# Begin Group "login"
+# Begin Group "login_txt"
 
 # PROP Default_Filter ""
 # Begin Source File
diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp
index a74c642c4..bf4249972 100644
--- a/vcproj-6/map-server_sql.dsp
+++ b/vcproj-6/map-server_sql.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=map_sql - Win32 Release
+CFG=map_sql - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=map_sql - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "map-server_sql.mak" CFG="map_sql - Win32 Release"
+!MESSAGE NMAKE /f "map-server_sql.mak" CFG="map_sql - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "map_sql - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "map_sql - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=map_sql - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "map_sql - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_sql\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 WSOCK32.lib libmysql.lib zdll.lib pcre.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/map_sql/map-server_sql.pdb" /machine:I386 /out:"../map-server_sql.exe" /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\zlib\lib" /libpath:"..\3rdparty\pcre\lib"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 libmysql.lib kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ELSEIF  "$(CFG)" == "map_sql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_sql\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libmysql.lib kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ENDIF 
+
 # Begin Target
 
 # Name "map_sql - Win32 Release"
+# Name "map_sql - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -91,14 +125,6 @@ SOURCE=..\src\common\grfio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\common\lock.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\malloc.c
 # End Source File
 # Begin Source File
@@ -107,19 +133,19 @@ SOURCE=..\src\common\malloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.c
+SOURCE=..\src\common\mapindex.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.h
+SOURCE=..\src\common\mapindex.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.c
+SOURCE=..\src\common\md5calc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.h
+SOURCE=..\src\common\md5calc.h
 # End Source File
 # Begin Source File
 
@@ -179,10 +205,6 @@ SOURCE=..\src\common\strlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\timer.c
 # End Source File
 # Begin Source File
@@ -202,7 +224,7 @@ SOURCE=..\src\common\utils.h
 SOURCE=..\src\common\version.h
 # End Source File
 # End Group
-# Begin Group "map"
+# Begin Group "map_sql"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -287,67 +309,67 @@ SOURCE=..\src\map\guild.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.c
+SOURCE=..\src\map\homunculus.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.h
+SOURCE=..\src\map\homunculus.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.c
+SOURCE=..\src\map\instance.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.h
+SOURCE=..\src\map\instance.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.c
+SOURCE=..\src\map\intif.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.h
+SOURCE=..\src\map\intif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.c
+SOURCE=..\src\map\itemdb.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.h
+SOURCE=..\src\map\itemdb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.c
+SOURCE=..\src\map\log.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.h
+SOURCE=..\src\map\log.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg.h
+SOURCE=..\src\map\mail.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg_sql.c
+SOURCE=..\src\map\mail.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.c
+SOURCE=..\src\map\map.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.h
+SOURCE=..\src\map\map.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.c
+SOURCE=..\src\map\mapreg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.h
+SOURCE=..\src\map\mapreg_sql.c
 # End Source File
 # Begin Source File
 
@@ -471,6 +493,10 @@ SOURCE=..\src\map\unit.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\map\unit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\map\vending.c
 # End Source File
 # Begin Source File
diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp
index f5ea544d2..a79b6dcdf 100644
--- a/vcproj-6/map-server_txt.dsp
+++ b/vcproj-6/map-server_txt.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=map_txt - Win32 Release
+CFG=map_txt - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=map_txt - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "map-server_txt.mak" CFG="map_txt - Win32 Release"
+!MESSAGE NMAKE /f "map-server_txt.mak" CFG="map_txt - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "map_txt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "map_txt - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=map_txt - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "map_txt - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_txt\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c
-# ADD BASE RSC /l 0x409
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "NDEBUG" /D "TXT_ONLY" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 WSOCK32.lib zdll.lib pcre.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/map_txt/map-server_txt.pdb" /machine:I386 /out:"../map-server_txt.exe" /libpath:"..\3rdparty\zlib\lib" /libpath:"..\3rdparty\pcre\lib"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ELSEIF  "$(CFG)" == "map_txt - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_txt\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "_DEBUG" /D "TXT_ONLY" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ENDIF 
+
 # Begin Target
 
 # Name "map_txt - Win32 Release"
+# Name "map_txt - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -107,19 +141,19 @@ SOURCE=..\src\common\malloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.c
+SOURCE=..\src\common\mapindex.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.h
+SOURCE=..\src\common\mapindex.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.c
+SOURCE=..\src\common\md5calc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.h
+SOURCE=..\src\common\md5calc.h
 # End Source File
 # Begin Source File
 
@@ -171,10 +205,6 @@ SOURCE=..\src\common\strlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\timer.c
 # End Source File
 # Begin Source File
@@ -194,7 +224,7 @@ SOURCE=..\src\common\utils.h
 SOURCE=..\src\common\version.h
 # End Source File
 # End Group
-# Begin Group "map"
+# Begin Group "map_txt"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -203,271 +233,271 @@ SOURCE=..\src\map\atcommand.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\battle.c
+SOURCE=..\src\map\atcommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\battleground.c
+SOURCE=..\src\map\battle.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\buyingstore.c
+SOURCE=..\src\map\battle.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\chat.c
+SOURCE=..\src\map\battleground.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\chrif.c
+SOURCE=..\src\map\battleground.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\clif.c
+SOURCE=..\src\map\buyingstore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\date.c
+SOURCE=..\src\map\buyingstore.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\duel.c
+SOURCE=..\src\map\chat.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\guild.c
+SOURCE=..\src\map\chat.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.c
+SOURCE=..\src\map\chrif.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.c
+SOURCE=..\src\map\chrif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.c
+SOURCE=..\src\map\clif.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.c
+SOURCE=..\src\map\clif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.c
+SOURCE=..\src\map\date.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.c
+SOURCE=..\src\map\date.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.c
+SOURCE=..\src\map\duel.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mercenary.c
+SOURCE=..\src\map\duel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mob.c
+SOURCE=..\src\map\guild.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\npc.c
+SOURCE=..\src\map\guild.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\npc_chat.c
+SOURCE=..\src\map\homunculus.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\party.c
+SOURCE=..\src\map\homunculus.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\path.c
+SOURCE=..\src\map\instance.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\pc.c
+SOURCE=..\src\map\instance.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\pet.c
+SOURCE=..\src\map\intif.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\quest.c
+SOURCE=..\src\map\intif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\script.c
+SOURCE=..\src\map\itemdb.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\searchstore.c
+SOURCE=..\src\map\itemdb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\skill.c
+SOURCE=..\src\map\log.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\status.c
+SOURCE=..\src\map\log.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\storage.c
+SOURCE=..\src\map\mail.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\trade.c
+SOURCE=..\src\map\mail.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\unit.c
+SOURCE=..\src\map\map.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\vending.c
+SOURCE=..\src\map\map.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\atcommand.h
+SOURCE=..\src\map\mapreg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\battle.h
+SOURCE=..\src\map\mapreg_txt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\battleground.h
+SOURCE=..\src\map\mercenary.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\buyingstore.h
+SOURCE=..\src\map\mercenary.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\chat.h
+SOURCE=..\src\map\mob.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\chrif.h
+SOURCE=..\src\map\mob.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\clif.h
+SOURCE=..\src\map\npc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\date.h
+SOURCE=..\src\map\npc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\duel.h
+SOURCE=..\src\map\npc_chat.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\guild.h
+SOURCE=..\src\map\party.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.h
+SOURCE=..\src\map\party.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.h
+SOURCE=..\src\map\path.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.h
+SOURCE=..\src\map\path.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.h
+SOURCE=..\src\map\pc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.h
+SOURCE=..\src\map\pc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg.h
+SOURCE=..\src\map\pet.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg_txt.c
+SOURCE=..\src\map\pet.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.h
+SOURCE=..\src\map\quest.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.h
+SOURCE=..\src\map\quest.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mercenary.h
+SOURCE=..\src\map\script.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mob.h
+SOURCE=..\src\map\script.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\npc.h
+SOURCE=..\src\map\searchstore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\party.h
+SOURCE=..\src\map\searchstore.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\path.h
+SOURCE=..\src\map\skill.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\pc.h
+SOURCE=..\src\map\skill.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\pet.h
+SOURCE=..\src\map\status.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\quest.h
+SOURCE=..\src\map\status.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\script.h
+SOURCE=..\src\map\storage.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\searchstore.h
+SOURCE=..\src\map\storage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\skill.h
+SOURCE=..\src\map\trade.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\status.h
+SOURCE=..\src\map\trade.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\storage.h
+SOURCE=..\src\map\unit.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\trade.h
+SOURCE=..\src\map\unit.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\unit.h
+SOURCE=..\src\map\vending.c
 # End Source File
 # Begin Source File
 
diff --git a/vcproj-6/mapcache.dsp b/vcproj-6/mapcache.dsp
new file mode 100644
index 000000000..015835d2d
--- /dev/null
+++ b/vcproj-6/mapcache.dsp
@@ -0,0 +1,160 @@
+# Microsoft Developer Studio Project File - Name="mapcache" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mapcache - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mapcache.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mapcache.mak" CFG="mapcache - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mapcache - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mapcache - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mapcache - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\mapcache\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\zlib\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "MINICORE" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\zlib\lib"
+
+!ELSEIF  "$(CFG)" == "mapcache - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\mapcache\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\zlib\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "MINICORE" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\zlib\lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mapcache - Win32 Release"
+# Name "mapcache - Win32 Debug"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\common\cbasetypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\grfio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\grfio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mmo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\version.h
+# End Source File
+# End Group
+# Begin Group "mapcache"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\tool\mapcache.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/vcproj-6/plugin-console.dsp b/vcproj-6/plugin-console.dsp
index f61a7c0b2..3794e60ed 100644
--- a/vcproj-6/plugin-console.dsp
+++ b/vcproj-6/plugin-console.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="console" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="plugin_console" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=console - Win32 Debug
+CFG=plugin_console - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "console.mak".
+!MESSAGE NMAKE /f "plugin-console.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "console.mak" CFG="console - Win32 Debug"
+!MESSAGE NMAKE /f "plugin-console.mak" CFG="plugin_console - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "console - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "console - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "plugin_console - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "plugin_console - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "console - Win32 Release"
+!IF  "$(CFG)" == "plugin_console - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release/console"
-# PROP Intermediate_Dir "Release/console"
+# PROP Output_Dir "..\plugins"
+# PROP Intermediate_Dir "tmp\plugin_console\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONSOLE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX- /O2 /I "../3rdparty/msinttypes/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "..\3rdparty\msinttypes\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "__WIN32" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /Oicf /win32
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/console.pdb" /machine:I386 /out:"../plugins/console.dll"
+# ADD LINK32 kernel32.lib /nologo /dll /machine:I386 /out:"..\plugins\console.dll"
 
-!ELSEIF  "$(CFG)" == "console - Win32 Debug"
+!ELSEIF  "$(CFG)" == "plugin_console - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -66,12 +66,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug/console"
-# PROP Intermediate_Dir "Debug/console"
+# PROP Output_Dir "..\plugins"
+# PROP Intermediate_Dir "tmp\plugin_console\Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONSOLE_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX- /ZI /Od /I "../3rdparty/msinttypes/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONSOLE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\3rdparty\msinttypes\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "__WIN32" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /Oicf /win32
@@ -83,14 +83,17 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/console.pdb" /debug /machine:I386 /out:"../plugins/console.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib /nologo /dll /debug /machine:I386 /out:"..\plugins\console.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "console - Win32 Release"
-# Name "console - Win32 Debug"
+# Name "plugin_console - Win32 Release"
+# Name "plugin_console - Win32 Debug"
+# Begin Group "console"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\src\plugins\console.c
@@ -99,5 +102,6 @@ SOURCE=..\src\plugins\console.c
 
 SOURCE=..\src\plugins\console.def
 # End Source File
+# End Group
 # End Target
 # End Project
diff --git a/vcproj-6/plugin-pid.dsp b/vcproj-6/plugin-pid.dsp
index 6626de710..b9dc130e9 100644
--- a/vcproj-6/plugin-pid.dsp
+++ b/vcproj-6/plugin-pid.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pid" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="plugin_pid" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=pid - Win32 Debug
+CFG=plugin_pid - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "pid.mak".
+!MESSAGE NMAKE /f "plugin-pid.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "pid.mak" CFG="pid - Win32 Debug"
+!MESSAGE NMAKE /f "plugin-pid.mak" CFG="plugin_pid - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "pid - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "pid - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "plugin_pid - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "plugin_pid - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "pid - Win32 Release"
+!IF  "$(CFG)" == "plugin_pid - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release/pid"
-# PROP Intermediate_Dir "Release/pid"
+# PROP Output_Dir "..\plugins"
+# PROP Intermediate_Dir "tmp\plugin_pid\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PID_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX- /O2 /I "../3rdparty/msinttypes/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "..\3rdparty\msinttypes\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "__WIN32" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /Oicf /win32
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/pid.pdb" /machine:I386 /out:"../plugins/pid.dll"
+# ADD LINK32 kernel32.lib /nologo /dll /machine:I386 /out:"..\plugins\pid.dll"
 
-!ELSEIF  "$(CFG)" == "pid - Win32 Debug"
+!ELSEIF  "$(CFG)" == "plugin_pid - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -66,12 +66,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug/pid"
-# PROP Intermediate_Dir "Debug/pid"
+# PROP Output_Dir "..\plugins"
+# PROP Intermediate_Dir "tmp\plugin_pid\Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PID_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX- /ZI /Od /I "../3rdparty/msinttypes/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PID_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\3rdparty\msinttypes\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "__WIN32" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /Oicf /win32
@@ -83,14 +83,17 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/pid.pdb" /debug /machine:I386 /out:"../plugins/pid.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib /nologo /dll /debug /machine:I386 /out:"..\plugins\pid.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "pid - Win32 Release"
-# Name "pid - Win32 Debug"
+# Name "plugin_pid - Win32 Release"
+# Name "plugin_pid - Win32 Debug"
+# Begin Group "pid"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\src\plugins\pid.c
@@ -99,5 +102,6 @@ SOURCE=..\src\plugins\pid.c
 
 SOURCE=..\src\plugins\pid.def
 # End Source File
+# End Group
 # End Target
 # End Project
diff --git a/vcproj-6/txt-converter-char.dsp b/vcproj-6/txt-converter-char.dsp
new file mode 100644
index 000000000..cb23fe4a9
--- /dev/null
+++ b/vcproj-6/txt-converter-char.dsp
@@ -0,0 +1,568 @@
+# Microsoft Developer Studio Project File - Name="txt_converter_char" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=txt_converter_char - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "txt-converter-char.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "txt-converter-char.mak" CFG="txt_converter_char - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "txt_converter_char - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "txt_converter_char - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX- /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib libmysql.lib /nologo /subsystem:console /machine:I386 /libpath:"..\3rdparty\mysql\lib"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX- /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "txt_converter_char - Win32 Release"
+# Name "txt_converter_char - Win32 Debug"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\common\cbasetypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\ers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mapindex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mapindex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mmo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\timer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\version.h
+# End Source File
+# End Group
+# Begin Group "char_sql"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\char_sql\char.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\char.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_guild.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_guild.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_mercenary.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_mercenary.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_party.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_party.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_pet.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_pet.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_storage.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_storage.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\inter.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\inter.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_sql"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_sql"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "char_txt"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\char\char.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\char.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_guild.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_guild.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_party.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_party.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_pet.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_pet.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_storage.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\int_storage.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\inter.c
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\inter.h
+
+!IF  "$(CFG)" == "txt_converter_char - Win32 Release"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Release\char_txt"
+
+!ELSEIF  "$(CFG)" == "txt_converter_char - Win32 Debug"
+
+# PROP Intermediate_Dir "tmp\txt_converter_char\Debug\char_txt"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "converter"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\src\txt-converter\char-converter.c"
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/vcproj-6/txt-converter-login.dsp b/vcproj-6/txt-converter-login.dsp
new file mode 100644
index 000000000..27213b1b3
--- /dev/null
+++ b/vcproj-6/txt-converter-login.dsp
@@ -0,0 +1,192 @@
+# Microsoft Developer Studio Project File - Name="txt_converter_login" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=txt_converter_login - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "txt-converter-login.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "txt-converter-login.mak" CFG="txt_converter_login - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "txt_converter_login - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "txt_converter_login - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "txt_converter_login - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\txt_converter_login\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX- /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib libmysql.lib /nologo /subsystem:console /machine:I386 /libpath:"..\3rdparty\mysql\lib"
+
+!ELSEIF  "$(CFG)" == "txt_converter_login - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\txt_converter_login\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX- /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "txt_converter_login - Win32 Release"
+# Name "txt_converter_login - Win32 Debug"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\common\cbasetypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\ers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mmo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\timer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\version.h
+# End Source File
+# End Group
+# Begin Group "login"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\login\account.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\account_sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\account_txt.c
+# End Source File
+# End Group
+# Begin Group "converter"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\src\txt-converter\login-converter.c"
+# End Source File
+# End Group
+# End Target
+# End Project