diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2008-10-23 00:08:26 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2008-10-23 00:08:26 +0000 |
| commit | f0fb58027eaaab3572aac3c89227aeab05423819 (patch) | |
| tree | 0ec454eaf88bf1b59636160fc3a6b969308ff389 /src/map/chrif.c | |
| parent | 682749567e93d1e2282e5de150f3900a0ac5b4f8 (diff) | |
| download | tmwa-f0fb58027eaaab3572aac3c89227aeab05423819.tar.gz tmwa-f0fb58027eaaab3572aac3c89227aeab05423819.tar.bz2 tmwa-f0fb58027eaaab3572aac3c89227aeab05423819.tar.xz tmwa-f0fb58027eaaab3572aac3c89227aeab05423819.zip | |
Commit Mantis tasks 486 and 460
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index dc401b6..ceeac26 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -689,13 +689,7 @@ int chrif_divorce(int char_id, int partner_id) nullpo_retr(0, sd = map_nick2sd(map_charid2nick(partner_id))); if (sd->status.partner_id == char_id) { int i; - //離婚(相方は既にキャラが消えている筈なので) sd->status.partner_id = 0; - - //相方の結婚指輪を剥奪 - for(i = 0; i < MAX_INVENTORY; i++) - if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F) - pc_delitem(sd, i, 1, 0); } return 0; @@ -717,7 +711,7 @@ int chrif_accountdeletion(int fd) if (acc > 0) { if (sd != NULL) { sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters - clif_displaymessage(sd->fd, "Your account has been deleted (disconnexion)..."); + clif_displaymessage(sd->fd, "Your account has been deleted (disconnection)..."); clif_setwaitclose(sd->fd); // forced to disconnect for the change } } else { |