summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/chrif.c5
-rw-r--r--src/map/chrif.h2
-rw-r--r--src/map/clif.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 3723cb4ac..bcc1da935 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -251,7 +251,7 @@ bool chrif_save(struct map_session_data *sd, int flag) {
ShowError("chrif_save: Failed to set up player %d:%d for proper quitting!\n", sd->status.account_id, sd->status.char_id);
}
- chrif_check(-1); //Character is saved on reconnect.
+ chrif_check(false); //Character is saved on reconnect.
//For data sync
if (sd->state.storage_flag == 2)
@@ -361,7 +361,7 @@ bool chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port)
return false;
}
- chrif_check(-1);
+ chrif_check(false);
WFIFOHEAD(chrif->fd,35);
WFIFOW(chrif->fd, 0) = 0x2b05;
@@ -1678,7 +1678,6 @@ void chrif_defaults(void) {
chrif->buildfamelist = chrif_buildfamelist;
chrif->save_scdata = chrif_save_scdata;
chrif->ragsrvinfo = chrif_ragsrvinfo;
- //chrif->char_offline = chrif_char_offline;
chrif->char_offline_nsd = chrif_char_offline_nsd;
chrif->char_reset_offline = chrif_char_reset_offline;
chrif->send_users_tochar = send_users_tochar;
diff --git a/src/map/chrif.h b/src/map/chrif.h
index da3f2fb3c..7e7aa43cd 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -146,6 +146,6 @@ struct chrif_interface *chrif;
void chrif_defaults(void);
// There's no need for another function when a simple macro can do exactly the same effect
-#define chrif_char_offline(x) chrif->char_offline_nsd(x->status.account_id,x->status.char_id)
+#define chrif_char_offline(x) chrif->char_offline_nsd((x)->status.account_id,(x)->status.char_id)
#endif /* _CHRIF_H_ */
diff --git a/src/map/clif.c b/src/map/clif.c
index 77d4d20d8..1bb68b212 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14154,7 +14154,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
}
} else { //friend not online -- ask char server to delete from his friendlist
- if(chrif->removefriend(char_id,sd->status.char_id)) { // char-server offline, abort
+ if(!chrif->removefriend(char_id,sd->status.char_id)) { // char-server offline, abort
clif->message(fd, msg_txt(673)); //"This action can't be performed at the moment. Please try again later."
return;
}