diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-20 20:33:32 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-20 20:33:32 +0000 |
| commit | 44d7606656a650dc43018b5c63bb56ad1f70e77c (patch) | |
| tree | a34a45286714803911fe2bf55315c611a444e605 /src/map/pc.c | |
| parent | a02514bc54c044f141520118ffd7e0b6ff5ecae2 (diff) | |
| download | hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.gz hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.bz2 hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.xz hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.zip | |
Merged TXT removal branch back to trunk.
* TXT save engine is removed and no longer supported.
* See also tid:53926, tid:57717.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15503 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 17a695fff..3155484dd 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1188,10 +1188,8 @@ 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 intif_request_questlog(sd); -#endif if (sd->state.connect_new == 0 && sd->fd) { //Character already loaded map! Gotta trigger LoadEndAck manually. @@ -1199,9 +1197,8 @@ int pc_reg_received(struct map_session_data *sd) clif_parse_LoadEndAck(sd->fd, sd); } -#ifndef TXT_ONLY pc_inventory_rentals(sd); -#endif + return 1; } @@ -7962,15 +7959,10 @@ int pc_divorce(struct map_session_data *sd) if( (p_sd = map_charid2sd(sd->status.partner_id)) == NULL ) { // Lets char server do the divorce -#ifndef TXT_ONLY if( chrif_divorce(sd->status.char_id, sd->status.partner_id) ) return -1; // No char server connected return 0; -#else - ShowError("pc_divorce: p_sd nullpo\n"); - return -1; -#endif } // Both players online, lets do the divorce manually |