* Merged the tmpsql branch:

- Abstraction for the sql code (sql.c/h).
- New configure script and makefiles.
- Restored txt zeny logging code. (r10814)
- Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs. (r10814)
- Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833)
- Improved db reading code a bit for consistency. (r11077)
- Added separate atcommand for mail deletion. (r11077)
- Corrected a few messages that said "new" instead of "unread". (r11077)
- Broadcast (*) messages now use "*" as the target's name (not ""). (r11077)
- Moved StringBuf code from utils.c/h to strlib.c/h. (r11084 r11117)
- Some misc login server cleanups (reformatting etc). (r11136)
- Corrected/modified some header entries. (r11141 r11147 11148)
- Adjusted VS project files. (r11147)
- Adjusted the way the sql charserver does item saving. (r11192)
- Corrected usage of reserved keyword 'friend' in mmo.h. (r11192)

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

6 files changed, 55 insertions, 121 deletions

diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 8d704bbdf..0427e7c27 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="char-server_sql"
 	ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
 	RootNamespace="char-server_sql"
@@ -298,6 +298,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sql.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sql.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
@@ -385,14 +393,6 @@
 				RelativePath="..\src\char_sql\inter.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\char_sql\itemdb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\char_sql\itemdb.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index fd8a87dfe..531c5519e 100644
--- a/vcproj-8/char-server_txt.vcproj
+++ b/vcproj-8/char-server_txt.vcproj
@@ -224,6 +224,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\char\int_homun.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\char\int_party.c"
 				>
 			</File>
diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index c7f4bf252..9a128df80 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="login-server_sql"
 	ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
 	RootNamespace="login-server_sql"
@@ -312,6 +312,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sql.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sql.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index bdad0a326..913422ea2 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -305,6 +305,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sql.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sql.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj
index e53bed304..7e2b1bd45 100644
--- a/vcproj-8/txt-converter-char.vcproj
+++ b/vcproj-8/txt-converter-char.vcproj
@@ -204,24 +204,6 @@
 			<File
 				RelativePath="..\src\char\char.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\char.h"
@@ -230,24 +212,6 @@
 			<File
 				RelativePath="..\src\char\int_guild.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\int_guild.h"
@@ -256,24 +220,6 @@
 			<File
 				RelativePath="..\src\char\int_party.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\int_party.h"
@@ -282,24 +228,6 @@
 			<File
 				RelativePath="..\src\char\int_pet.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\int_pet.h"
@@ -308,24 +236,6 @@
 			<File
 				RelativePath="..\src\char\int_storage.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\int_storage.h"
@@ -334,24 +244,6 @@
 			<File
 				RelativePath="..\src\char\inter.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\char\inter.h"
@@ -402,6 +294,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sql.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sql.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj
index 2997e471b..3036b0f3f 100644
--- a/vcproj-8/txt-converter-login.vcproj
+++ b/vcproj-8/txt-converter-login.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="txt-converter-login"
 	ProjectGUID="{D356871D-58E1-450B-967A-E9E9646175AF}"
 	RootNamespace="txt-converter-login"
@@ -97,6 +97,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -191,6 +194,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -242,11 +248,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.c"
+				RelativePath="..\src\common\sql.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sql.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
 		</Filter>