diff options
| author | shennetsind <ind@henn.et> | 2013-11-16 03:06:48 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-16 03:06:48 -0200 |
| commit | d77c0115b7797d7205b0d40fa0a762999abe5a60 (patch) | |
| tree | 0817257d04961cfd8ec412d0cc33a6d2195f000e /src/char/char.c | |
| parent | ee281a26174c68e4de3a5afe32e0232e2c832570 (diff) | |
| download | hercules-d77c0115b7797d7205b0d40fa0a762999abe5a60.tar.gz hercules-d77c0115b7797d7205b0d40fa0a762999abe5a60.tar.bz2 hercules-d77c0115b7797d7205b0d40fa0a762999abe5a60.tar.xz hercules-d77c0115b7797d7205b0d40fa0a762999abe5a60.zip | |
Updated char server's response to offline map server
Previously attempting to log in while map server was unavailable or not yet ready would close the client, now the char select window shows up and attempting to select a character while the map server is unavailable will display a pop up "the map is not available", client will remain in char select window and won't close anymore.
Special Thanks to Haruna.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/char/char.c b/src/char/char.c index 77d9f5217..1032cbbec 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -2277,7 +2277,6 @@ int parse_fromlogin(int fd) { // find the authenticated session with this account id ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) ); if( i < fd_max ) { - int server_id; memcpy(sd->email, RFIFOP(fd,6), 40); sd->expiration_time = (time_t)RFIFOL(fd,46); sd->group_id = RFIFOB(fd,50); @@ -2290,10 +2289,8 @@ int parse_fromlogin(int fd) { safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate)); safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode)); sd->pincode_change = RFIFOL(fd,68); - ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] ); // continued from char_auth_ok... - if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359 - (max_connect_user == 0 && sd->group_id != gm_allow_group) || + if( (max_connect_user == 0 && sd->group_id != gm_allow_group) || ( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) { // refuse connection (over populated) WFIFOHEAD(i,3); @@ -3941,9 +3938,11 @@ int parse_char(int fd) int char_id; uint32 subnet_map_ip; struct auth_node* node; + int server_id = 0; int slot = RFIFOB(fd,2); RFIFOSKIP(fd,3); + #if PACKETVER >= 20110309 if( *pincode->enabled ){ // hack check struct online_char_data* character; @@ -3957,6 +3956,19 @@ int parse_char(int fd) } } #endif + + ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] ); + /* not available, tell it to wait (client wont close; char select will respawn). + * magic response found by Ind thanks to Yommy <3 */ + if( server_id == ARRAYLENGTH(server) ) { + WFIFOHEAD(fd, 24); + WFIFOW(fd, 0) = 0x840; + WFIFOW(fd, 2) = 24; + safestrncpy((char*)WFIFOP(fd,4), "0", 20);/* we can't send empty (otherwise the list will pop up) */ + WFIFOSET(fd, 24); + break; + } + if ( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'", char_db, sd->account_id, slot) || SQL_SUCCESS != SQL->NextRow(sql_handle) || SQL_SUCCESS != SQL->GetData(sql_handle, 0, &data, NULL) ) |