Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 10 insertions, 20 deletions

diff --git a/src/char/inter.h b/src/char/inter.h
index f6663813a..d7d7c3c2b 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -2,12 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _INTER_SQL_H_
-#define _INTER_SQL_H_
+#ifndef CHAR_INTER_H
+#define CHAR_INTER_H
 
-struct accreg;
-#include "../common/sql.h"
 #include "char.h"
+#include "../common/cbasetypes.h"
+#include "../common/sql.h"
+
+struct accreg;
 
 int inter_init_sql(const char *file);
 void inter_final(void);
@@ -15,8 +17,10 @@ int inter_parse_frommap(int fd);
 int inter_mapif_init(int fd);
 int mapif_send_gmaccounts(void);
 int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason);
+void mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state);
 
-int inter_log(char *fmt,...);
+int inter_log(char *fmt, ...) __attribute__((format(printf, 1, 2)));
+int inter_vlog(char *fmt, va_list ap);
 
 #define inter_cfgName "conf/inter-server.conf"
 
@@ -27,18 +31,4 @@ extern Sql* lsql_handle;
 
 int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
 
-uint64 inter_chk_lastuid(int8 flag, uint64 value);
-#ifdef NSI_UNIQUE_ID
-	#define updateLastUid(val_) inter_chk_lastuid(1, val_)
-	#define dbUpdateUid(handler_)\
-	{ \
-		uint64 unique_id_ = inter_chk_lastuid(0, 0); \
-		if (unique_id_ && SQL_ERROR == SQL->Query(handler_, "UPDATE `%s` SET `value`='%"PRIu64"' WHERE `varname`='unique_id'", interreg_db, unique_id_)) \
-				Sql_ShowDebug(handler_);\
-	}
-#else
-	#define dbUpdateUid(handler_)
-	#define updateLastUid(val_)
-#endif
-
-#endif /* _INTER_SQL_H_ */
+#endif /* CHAR_INTER_H */