- 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, 3 deletions

diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c
index f91276e75..3ed0c2aa9 100644
--- a/src/char_sql/int_storage.c
+++ b/src/char_sql/int_storage.c
@@ -13,6 +13,7 @@
 

 #define STORAGE_MEMINC	16

 

+#ifndef TXT_SQL_CONVERT

 // reset by inter_config_read()

 struct storage *storage_pt=NULL;

 struct guild_storage *guild_storage_pt=NULL;

@@ -27,6 +28,7 @@ struct guild_storage *guild_storage_pt=NULL;
 

 #endif

 

+#endif //TXT_SQL_CONVERT

 // storage data -> DB conversion

 int storage_tosql(int account_id,struct storage *p){

 	int i,j;

@@ -55,6 +57,7 @@ int storage_tosql(int account_id,struct storage *p){
 	//printf ("storage dump to DB - id: %d (total: %d)\n", account_id, j);

 	return 0;

 }

+#ifndef TXT_SQL_CONVERT

 

 // DB -> storage data conversion

 int storage_fromsql(int account_id, struct storage *p){

@@ -99,7 +102,7 @@ int storage_fromsql(int account_id, struct storage *p){
 	ShowInfo ("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);

 	return 1;

 }

-

+#endif //TXT_SQL_CONVERT

 // Save guild_storage data to sql

 int guild_storage_tosql(int guild_id, struct guild_storage *p){

 	int i,j;

@@ -128,7 +131,7 @@ int guild_storage_tosql(int guild_id, struct guild_storage *p){
 	ShowInfo ("guild storage save to DB - id: %d (total: %d)\n", guild_id,i);

 	return 0;

 }

-

+#ifndef TXT_SQL_CONVERT

 // Load guild_storage data to mem

 int guild_storage_fromsql(int guild_id, struct guild_storage *p){

 	int i=0,j;

@@ -361,4 +364,4 @@ int inter_storage_parse_frommap(int fd){
 	}

 	return 1;

 }

-

+#endif //TXT_SQL_CONVERT