summaryrefslogtreecommitdiff
path: root/src/map/chrif.c
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-16 13:56:19 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-16 13:56:19 -0600
commit68c3337b48956e286ce8539e164c46eb91e96687 (patch)
tree1c0ba4007fcbf4d9730b3e1351e8e8b5f7a18fc8 /src/map/chrif.c
parentd450f9fd7b5d4fd71d4f7e244ef9d0786d0f745a (diff)
downloadtmwa-68c3337b48956e286ce8539e164c46eb91e96687.tar.gz
tmwa-68c3337b48956e286ce8539e164c46eb91e96687.tar.bz2
tmwa-68c3337b48956e286ce8539e164c46eb91e96687.tar.xz
tmwa-68c3337b48956e286ce8539e164c46eb91e96687.zip
Only resume script after divorce if need to
Diffstat (limited to 'src/map/chrif.c')
-rw-r--r--src/map/chrif.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index ef681b7..40972f4 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -692,7 +692,11 @@ int chrif_divorce(int char_id, int partner_id)
sd = map_nick2sd(map_charid2nick(char_id));
if (sd && sd->status.partner_id == partner_id) {
sd->status.partner_id = 0;
- map_scriptcont(sd, sd->npc_id);
+
+ if (sd->npc_flags.divorce) {
+ sd->npc_flags.divorce = 0;
+ map_scriptcont(sd, sd->npc_id);
+ }
}
nullpo_retr(0, sd = map_nick2sd(map_charid2nick(partner_id)));