diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-16 07:48:53 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-16 07:48:53 +0000 |
| commit | 226d526a49322d1fa755645801254703dfd90476 (patch) | |
| tree | b616c8aec2c30bc90d771953838c566ba5daad62 /src/map | |
| parent | 1e560981e0c0dfff9cc0ae4c8cb3eb7e59438745 (diff) | |
| download | hercules-226d526a49322d1fa755645801254703dfd90476.tar.gz hercules-226d526a49322d1fa755645801254703dfd90476.tar.bz2 hercules-226d526a49322d1fa755645801254703dfd90476.tar.xz hercules-226d526a49322d1fa755645801254703dfd90476.zip | |
Fixed an issue in r12575 where 'not setting char offline when going from mapserver to charserver' also caused a permanent account lockout if the player pressed 'cancel' in the char select screen.
Merged some recent changes from SQL to TXT, as someone didn't bother to do it.
Ifdefed the quest data request code as SQL-only (this was causing server disconnects whenver someone logged in).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12606 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index ea2a10b4c..4c6d0f833 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7952,7 +7952,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) } #ifndef TXT_ONLY - mail_clear(sd); + mail_clear(sd); #endif quest_pc_login(sd); diff --git a/src/map/pc.c b/src/map/pc.c index 400799e61..27336c05b 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -962,11 +962,11 @@ int pc_reg_received(struct map_session_data *sd) status_calc_pc(sd,1); chrif_scdata_request(sd->status.account_id, sd->status.char_id); + #ifndef TXT_ONLY intif_Mail_requestinbox(sd->status.char_id, 0); // MAIL SYSTEM - Request Mail Inbox -#endif - intif_request_questlog(sd); +#endif if (!sd->state.connect_new && sd->fd) { //Character already loaded map! Gotta trigger LoadEndAck manually. |