summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-04 11:32:43 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-04 11:32:43 +0000
commitfa3b6bdf1d16f43072cbcf14e6490be64e8b0f50 (patch)
treedaddbb9f66e94f5d8227d81782dd53b99c863504
parenta39b509e0d987d907f48893478da07fc4969a8cd (diff)
downloadhercules-fa3b6bdf1d16f43072cbcf14e6490be64e8b0f50.tar.gz
hercules-fa3b6bdf1d16f43072cbcf14e6490be64e8b0f50.tar.bz2
hercules-fa3b6bdf1d16f43072cbcf14e6490be64e8b0f50.tar.xz
hercules-fa3b6bdf1d16f43072cbcf14e6490be64e8b0f50.zip
Fixed offline divorce not working properly (bugreport:2295).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13259 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/chrif.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 0f5221994..cffc24726 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -890,13 +890,14 @@ int chrif_divorce(int partner_id1, int partner_id2)
/*==========================================
* Divorce players
+ * only used if 'partner_id' is offline
*------------------------------------------*/
int chrif_divorceack(int char_id, int partner_id)
{
struct map_session_data* sd;
int i;
- if (!char_id || !partner_id || (sd = map_charid2sd(partner_id)) == NULL || sd->status.partner_id != char_id)
+ if (!char_id || !partner_id || (sd = map_charid2sd(char_id)) == NULL || sd->status.partner_id != partner_id)
return 0;
// Update Partner info
@@ -907,6 +908,8 @@ int chrif_divorceack(int char_id, int partner_id)
if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F)
pc_delitem(sd, i, 1, 0);
+ //TODO: send clif_divorced()
+
return 0;
}
/*==========================================