diff options
| -rw-r--r-- | src/char/char.c | 4 | ||||
| -rw-r--r-- | src/char_sql/char.c | 6 | ||||
| -rw-r--r-- | src/map/irc.c | 2 | ||||
| -rw-r--r-- | src/txt-converter/char-converter.c | 2 | ||||
| -rw-r--r-- | src/txt-converter/login-converter.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/char/char.c b/src/char/char.c index c6cdf3f32..d91ebd1aa 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -412,7 +412,9 @@ static int char_db_kickoffline(DBKey key, void* data, va_list ap) mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 1); else if (character->waiting_disconnect == -1) set_char_offline(character->char_id, character->account_id); - else return 0; + else + return 0; // fail + return 1; } diff --git a/src/char_sql/char.c b/src/char_sql/char.c index a40d627b8..cf6ea56e7 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -339,8 +339,10 @@ static int char_db_kickoffline(DBKey key, void* data, va_list ap) mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 1); else if (character->waiting_disconnect == -1) set_char_offline(character->char_id, character->account_id); - else return 0; - return 1; // WTF, pick one! + else + return 0; // fail + + return 1; } void set_all_offline(int id) diff --git a/src/map/irc.c b/src/map/irc.c index 67d269e51..0238225fe 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -52,7 +52,7 @@ int irc_connect_timer(int tid, unsigned int tick, int id, int data) return 0; //Ok, this ShowInfo and printf are a little ugly, but they are meant to //debug just how long the code freezes here. [Skotlex] - ShowInfo("(IRC) Connecting to %s...\n", irc_ip_str); + ShowInfo("(IRC) Connecting to %s... ", irc_ip_str); irc_fd = make_connection(irc_ip,irc_port); if(irc_fd > 0){ printf("ok\n"); diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c index 8168e0ee3..dcc5b9653 100644 --- a/src/txt-converter/char-converter.c +++ b/src/txt-converter/char-converter.c @@ -301,6 +301,4 @@ int do_init(int argc, char** argv) return 0; } -void do_abort(void) {} - void do_final(void) {} diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c index 640b77230..6936ca782 100644 --- a/src/txt-converter/login-converter.c +++ b/src/txt-converter/login-converter.c @@ -227,8 +227,6 @@ int do_init(int argc, char** argv) return 0; } -void do_abort(void) {} - void do_final(void) { if( gm_account_db ) |