Merged TXT removal branch back to trunk.

* TXT save engine is removed and no longer supported.
* See also tid:53926, tid:57717.

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

1 files changed, 47 insertions, 28 deletions

diff --git a/src/char/char.h b/src/char/char.h
index bb1a530f0..73c2f9f72 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -1,62 +1,81 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_H_
-#define _CHAR_H_
+#ifndef _CHAR_SQL_H_
+#define _CHAR_SQL_H_
 
 #include "../common/core.h" // CORE_ST_LAST
-#include "../common/mmo.h"
 
-#ifndef TXT_SQL_CONVERT
 enum E_CHARSERVER_ST
 {
 	CHARSERVER_ST_RUNNING = CORE_ST_LAST,
 	CHARSERVER_ST_SHUTDOWN,
 	CHARSERVER_ST_LAST
 };
-#endif
+
+struct mmo_charstatus;
 
 #define MAX_MAP_SERVERS 30
 
 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
 
-struct character_data {
-	struct mmo_charstatus status;
-	int global_num;
-	struct global_reg global[GLOBAL_REG_NUM];
+enum {
+	TABLE_INVENTORY,
+	TABLE_CART,
+	TABLE_STORAGE,
+	TABLE_GUILD_STORAGE,
 };
 
-struct mmo_charstatus* search_character(int aid, int cid);
-struct mmo_charstatus* search_character_byname(char* character_name);
-int search_character_index(char* character_name);
-char* search_character_name(int index);
-int search_character_online(int aid, int cid);
+int memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch);
 
-int mapif_sendall(unsigned char *buf, unsigned int len);
-int mapif_sendallwos(int fd,unsigned char *buf, unsigned int len);
-int mapif_send(int fd,unsigned char *buf, unsigned int len);
+int mapif_sendall(unsigned char *buf,unsigned int len);
+int mapif_sendallwos(int fd,unsigned char *buf,unsigned int len);
+int mapif_send(int fd,unsigned char *buf,unsigned int len);
 
 int char_married(int pl1,int pl2);
 int char_child(int parent_id, int child_id);
-int char_family(int cid1, int cid2, int cid3);
-
-int char_log(char *fmt, ...);
+int char_family(int pl1,int pl2,int pl3);
 
 int request_accreg2(int account_id, int char_id);
-int char_parse_Registry(int account_id, int char_id, unsigned char *buf, int len);
-int save_accreg2(unsigned char *buf, int len);
-int char_account_reg_reply(int fd,int account_id,int char_id);
+int save_accreg2(unsigned char* buf, int len);
 
 extern int char_name_option;
 extern char char_name_letters[];
+extern bool char_gm_read;
 extern int autosave_interval;
+extern int save_log;
 extern char db_path[];
+extern char char_db[256];
+extern char scdata_db[256];
+extern char cart_db[256];
+extern char inventory_db[256];
+extern char charlog_db[256];
+extern char storage_db[256];
+extern char interlog_db[256];
+extern char reg_db[256];
+extern char skill_db[256];
+extern char memo_db[256];
+extern char guild_db[256];
+extern char guild_alliance_db[256];
+extern char guild_castle_db[256];
+extern char guild_expulsion_db[256];
+extern char guild_member_db[256];
+extern char guild_position_db[256];
+extern char guild_skill_db[256];
+extern char guild_storage_db[256];
+extern char party_db[256];
+extern char pet_db[256];
+extern char mail_db[256];
+extern char auction_db[256];
+extern char quest_db[256];
+
+extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris]
+
 extern int guild_exp_rate;
 extern int log_inter;
+
 //Exported for use in the TXT-SQL converter.
-extern char char_txt[];
-int char_config_read(const char *cfgName);
-int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int *reg_num);
-int parse_friend_txt(struct mmo_charstatus *p);
+int mmo_char_tosql(int char_id, struct mmo_charstatus *p);
+void sql_config_read(const char *cfgName);
 
-#endif /* _CHAR_H_ */
+#endif /* _CHAR_SQL_H_ */