- Rewrote the txt->sql converter. It now links directly to the char server files so that it should get auto-updated with any code changes in the later.

- The converter will now also convert: account-wide variables, parties, guilds, guild storage and guild castles. At this point the only two things not converted are login-server-wide account variables (##, they belong to the login converter) and homunculus (the SQL save function is messy and doesn't lends itself to be integrated with the converter the way all the other functions are).
- Modified the char servers so they are compatible with the converter, the define TXT_SQL_CONVERT identifies sections unique to each char-server mode (this would had been a hella lot easier if both char servers where the same code-base instead of duplicated code <.<)
- Updated the Makefiles as per the new compiling requirements for the converter.
- misceffect2 will no longer cause the effect on top of the source object when it is the fake npc.
- Added check so that Frost Nova doesn't hides hitting animation on targets.
- Added the missing brackets around the trade logs condition check, thanks to Coltaro.


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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index f8ae42c0f..89e9a540a 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -20,6 +20,7 @@
 char storage_txt[1024]="save/storage.txt";

 char guild_storage_txt[1024]="save/g_storage.txt";

 

+#ifndef TXT_SQL_CONVERT

 static struct dbt *storage_db;

 static struct dbt *guild_storage_db;

 

@@ -48,7 +49,7 @@ int storage_tostr(char *str,struct storage *p)
 		str[0]=0;

 	return 0;

 }

-

+#endif //TXT_SQL_CONVERT

 // 文字列を倉庫データに変換

 int storage_fromstr(char *str,struct storage *p)

 {

@@ -89,7 +90,7 @@ int storage_fromstr(char *str,struct storage *p)
 		ShowWarning("storage_fromstr: Found a storage line with more items than MAX_STORAGE (%d), remaining items have been discarded!\n", MAX_STORAGE);

 	return 0;

 }

-

+#ifndef TXT_SQL_CONVERT

 int guild_storage_tostr(char *str,struct guild_storage *p)

 {

 	int i,j,f=0;

@@ -114,7 +115,7 @@ int guild_storage_tostr(char *str,struct guild_storage *p)
 		str[0]=0;

 	return 0;

 }

-

+#endif //TXT_SQL_CONVERT

 int guild_storage_fromstr(char *str,struct guild_storage *p)

 {

 	int tmp_int[256];

@@ -153,7 +154,7 @@ int guild_storage_fromstr(char *str,struct guild_storage *p)
 		ShowWarning("guild_storage_fromstr: Found a storage line with more items than MAX_GUILD_STORAGE (%d), remaining items have been discarded!\n", MAX_GUILD_STORAGE);

 	return 0;

 }

-

+#ifndef TXT_SQL_CONVERT

 static void* create_storage(DBKey key, va_list args) {

 	struct storage *s;

 	s = (struct storage *) aCalloc(sizeof(struct storage), 1);

@@ -474,3 +475,4 @@ int inter_storage_parse_frommap(int fd)
 	}

 	return 1;

 }

+#endif //TXT_SQL_CONVERT