From 36a2e1945e4c27e438a1bce6e286691a60ed7adf Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 6 Apr 2009 14:58:19 -0600
Subject: Fix divorce in other situations
Like when one char is divorced and the marriage isn't cleared
---
src/char/char.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
(limited to 'src/char')
diff --git a/src/char/char.c b/src/char/char.c
index 677d4b3..82a1723 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1393,7 +1393,13 @@ int char_divorce(struct mmo_charstatus *cs) {
return 0;
if (cs->partner_id <= 0)
+ {
+ WBUFW(buf,0) = 0x2b12;
+ WBUFL(buf,2) = cs->char_id;
+ WBUFL(buf,6) = 0; // partner id 0 means failure
+ mapif_sendall(buf,10);
return 0;
+ }
WBUFW(buf,0) = 0x2b12;
WBUFL(buf,2) = cs->char_id;
@@ -1416,7 +1422,9 @@ int char_divorce(struct mmo_charstatus *cs) {
}
}
- WBUFL(buf,6) = 0; // partner id 0 means failure
+ // Our partner wasn't found, so just clear our marriage
+ WBUFL(buf,6) = cs->partner_id;
+ cs->partner_id = 0;
mapif_sendall(buf,10);
return 0;
--
cgit v1.2.3-70-g09d2