- 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, 4 insertions, 5 deletions

diff --git a/src/char_sql/inter.h b/src/char_sql/inter.h
index d84085651..8dc6f3668 100644
--- a/src/char_sql/inter.h
+++ b/src/char_sql/inter.h
@@ -1,10 +1,10 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL

 // For more information, see LICENCE in the main folder

 

-#ifndef _INTER_H_

-#define _INTER_H_

+#ifndef _INTER_SQL_H_

+#define _INTER_SQL_H_

 

-int inter_init(const char *file);

+int inter_init_sql(const char *file);

 void inter_final(void);

 int inter_parse_frommap(int fd);

 int inter_mapif_init(int fd);

@@ -50,8 +50,7 @@ extern char login_db_server_id[32];
 extern char login_db_server_pw[32];

 extern char login_db_server_db[32];

 

-extern int log_inter;

-

 extern char main_chat_nick[16];

 

+int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);

 #endif