- 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, 12 insertions, 14 deletions

diff --git a/src/char_sql/char.h b/src/char_sql/char.h
index 343d04b4e..70d8e3b13 100644
--- a/src/char_sql/char.h
+++ b/src/char_sql/char.h
@@ -1,5 +1,7 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL

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

+#ifndef _CHARSQL_H_

+#define _CHARSQL_H_

 

 #include "../common/core.h"

 #include "../common/socket.h"

@@ -9,8 +11,12 @@
 #include "../common/db.h"

 #include "../common/mapindex.h"

 

-#ifndef _CHAR_H_

-#define _CHAR_H_

+#include "inter.h"

+#include "int_pet.h"

+#include "int_guild.h"

+#include "int_party.h"

+#include "int_storage.h"

+#include "itemdb.h"

 

 #define START_CHAR_NUM 150000

 #define MAX_MAP_SERVERS 30

@@ -19,12 +25,6 @@
 

 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000

 

-struct mmo_map_server{

-  long ip;

-  short port;

-  int users;

-  unsigned short map[MAX_MAP_PER_SERVER];

-};

 struct itemtmp {

 	int flag;//checked = 1 else 0

 	int id;

@@ -100,13 +100,11 @@ extern int GM_num;
 extern struct gm_account *gm_account;

 

 extern int guild_exp_rate;

+extern int log_inter;

 

 extern int debug_mysql_query(char *file, int line, void *mysql, const char *q);

 

+//Exported for use in the TXT-SQL converter.

+int mmo_char_tosql(int char_id, struct mmo_charstatus *p);

+void sql_config_read(const char *cfgName);

 #endif

-

-#include "inter.h"

-#include "int_pet.h"

-#include "int_guild.h"

-#include "int_party.h"

-#include "int_storage.h"