1 files changed, 134 insertions, 84 deletions
diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp
index f5ea544d2..00e4cf716 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,65 @@ 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" /I "..\3rdparty\mt19937ar" /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" /I "..\3rdparty\mt19937ar" /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 "3rdparty"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\3rdparty\mt19937ar\mt19937ar.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\3rdparty\mt19937ar\mt19937ar.h
+# End Source File
+# End Group
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -107,19 +153,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
 
@@ -147,6 +193,14 @@ SOURCE=..\src\common\plugins.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\common\random.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\random.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\common\showmsg.c
 # End Source File
 # Begin Source File
@@ -171,10 +225,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 +244,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 +253,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