Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed divorce should work on both partners. Bug Report #2339.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13284 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-10-12 10:31:05 +00:00
parent d6989f8e0c
commit a3824eee1c
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/chrif.c
View File

@ -897,19 +897,25 @@ int chrif_divorceack(int char_id, int partner_id)
struct map_session_data* sd;
int i;
if (!char_id || !partner_id || (sd = map_charid2sd(char_id)) == NULL || sd->status.partner_id != partner_id)
if( !char_id || !partner_id )
return 0;
// Update Partner info
sd->status.partner_id = 0;
// Remove Wedding Rings from inventory
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);
//TODO: send clif_divorced()
if( (sd = map_charid2sd(char_id)) != NULL && sd->status.partner_id == partner_id )
{
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);
}
if( (sd = map_charid2sd(partner_id)) != NULL && sd->status.partner_id == char_id )
{
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;
}
/*==========================================