From 1baf68e197ad64444dcb558d34235c1a670eb2ed Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 26 Oct 2014 19:59:35 +0300 Subject: fix plugins compilation. --- src/login/login.c | 10 +++++----- src/login/login.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/login/login.c b/src/login/login.c index 7fd941192..f64615553 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -289,7 +289,7 @@ int login_lan_config_read(const char *lancfgName) return 0; } -void login_fromchar_auth_ack(int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct auth_node* node) +void login_fromchar_auth_ack(int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct login_auth_node* node) { WFIFOHEAD(fd,33); WFIFOW(fd,0) = 0x2713; @@ -320,7 +320,7 @@ void login_fromchar_auth_ack(int fd, int account_id, uint32 login_id1, uint32 lo void login_fromchar_parse_auth(int fd, int id, const char *const ip) { - struct auth_node* node; + struct login_auth_node* node; int account_id = RFIFOL(fd,2); uint32 login_id1 = RFIFOL(fd,6); @@ -330,7 +330,7 @@ void login_fromchar_parse_auth(int fd, int id, const char *const ip) int request_id = RFIFOL(fd,19); RFIFOSKIP(fd,23); - node = (struct auth_node*)idb_get(login->auth_db, account_id); + node = (struct login_auth_node*)idb_get(login->auth_db, account_id); if( runflag == LOGINSERVER_ST_RUNNING && node != NULL && node->account_id == account_id && @@ -1221,7 +1221,7 @@ void login_auth_ok(struct login_session_data* sd) uint8 server_num, n; uint32 subnet_char_ip; - struct auth_node* node; + struct login_auth_node* node; int i; if( runflag != LOGINSERVER_ST_RUNNING ) @@ -1314,7 +1314,7 @@ void login_auth_ok(struct login_session_data* sd) WFIFOSET(fd,47+32*server_num); // create temporary auth entry - CREATE(node, struct auth_node, 1); + CREATE(node, struct login_auth_node, 1); node->account_id = sd->account_id; node->login_id1 = sd->login_id1; node->login_id2 = sd->login_id2; diff --git a/src/login/login.h b/src/login/login.h index 2917ae2b3..096329d33 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -104,7 +104,7 @@ struct Login_Config { int subnet_count; }; -struct auth_node { +struct login_auth_node { int account_id; uint32 login_id1; uint32 login_id2; @@ -157,7 +157,7 @@ struct login_interface { void (*fromchar_accinfo) (int fd, int account_id, int u_fd, int u_aid, int u_group, int map_fd, struct mmo_account *acc); void (*fromchar_account) (int fd, int account_id, struct mmo_account *acc); void (*fromchar_account_update_other) (int account_id, unsigned int state); - void (*fromchar_auth_ack) (int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct auth_node* node); + void (*fromchar_auth_ack) (int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct login_auth_node* node); void (*fromchar_ban) (int account_id, time_t timestamp); void (*fromchar_change_sex_other) (int account_id, char sex); void (*fromchar_pong) (int fd); -- cgit v1.2.3-60-g2f50