* Merged changes from trunk [14827:14894/trunk].

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

6 files changed, 116 insertions, 20 deletions

diff --git a/vcproj-7.1/char-server_sql.vcproj b/vcproj-7.1/char-server_sql.vcproj
index 67b4bcb87..02ad69ff8 100644
--- a/vcproj-7.1/char-server_sql.vcproj
+++ b/vcproj-7.1/char-server_sql.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -88,7 +88,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -271,6 +271,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -310,6 +316,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-7.1/char-server_txt.vcproj b/vcproj-7.1/char-server_txt.vcproj
index 47b9b90b4..cf4606143 100644
--- a/vcproj-7.1/char-server_txt.vcproj
+++ b/vcproj-7.1/char-server_txt.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -88,7 +88,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -252,6 +252,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -285,6 +291,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-7.1/login-server_sql.vcproj b/vcproj-7.1/login-server_sql.vcproj
index a86f8246b..6ffd56f8f 100644
--- a/vcproj-7.1/login-server_sql.vcproj
+++ b/vcproj-7.1/login-server_sql.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_SQL"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -87,7 +87,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_SQL"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -230,6 +230,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -269,6 +275,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj
index 24fc249d7..624bb39d7 100644
--- a/vcproj-7.1/login-server_txt.vcproj
+++ b/vcproj-7.1/login-server_txt.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -93,7 +93,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -233,6 +233,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -266,6 +272,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj
index e694418eb..fa1b7f931 100644
--- a/vcproj-7.1/map-server_sql.vcproj
+++ b/vcproj-7.1/map-server_sql.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4018
 /wd4100"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -93,7 +93,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -399,16 +399,16 @@
 				RelativePath="..\src\common\malloc.h">
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.c">
+				RelativePath="..\src\common\mapindex.c">
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h">
+				RelativePath="..\src\common\mapindex.h">
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c">
+				RelativePath="..\src\common\md5calc.c">
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h">
+				RelativePath="..\src\common\md5calc.h">
 			</File>
 			<File
 				RelativePath="..\src\common\mmo.h">
@@ -429,6 +429,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -468,6 +474,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj
index f40134a44..b78fe1759 100644
--- a/vcproj-7.1/map-server_txt.vcproj
+++ b/vcproj-7.1/map-server_txt.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4018
 /wd4100"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
@@ -93,7 +93,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
@@ -399,16 +399,16 @@
 				RelativePath="..\src\common\malloc.h">
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.c">
+				RelativePath="..\src\common\mapindex.c">
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h">
+				RelativePath="..\src\common\mapindex.h">
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c">
+				RelativePath="..\src\common\md5calc.c">
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h">
+				RelativePath="..\src\common\md5calc.h">
 			</File>
 			<File
 				RelativePath="..\src\common\mmo.h">
@@ -429,6 +429,12 @@
 				RelativePath="..\src\common\plugins.h">
 			</File>
 			<File
+				RelativePath="..\src\common\random.c">
+			</File>
+			<File
+				RelativePath="..\src\common\random.h">
+			</File>
+			<File
 				RelativePath="..\src\common\showmsg.c">
 			</File>
 			<File
@@ -462,6 +468,16 @@
 				RelativePath="..\src\common\version.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			Filter="">
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c">
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>