From 3226368a1cd36e4d6e47302493fe5e0e91dddef3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 1 Mar 2009 12:20:01 -0700 Subject: Fix some bugs in the marriage scrcipts --- conf/magic.conf | 1 + npc/014-1_Woodland/wedding-officiator.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/magic.conf b/conf/magic.conf index 390df589..e0fb308c 100644 --- a/conf/magic.conf +++ b/conf/magic.conf @@ -573,6 +573,7 @@ NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = L_yes: if marriage(@caster_name$) announce @caster_name$ + " and " + strcharinfo(0) + " are now married!", 0; + close; } IF not (is_married(caster)) diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 6b7ace7e..20c7297e 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,7 +236,8 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; - if (divorce()) goto L_DidDivorce; + + if divorce(0) goto L_DidDivorce; mes "[Wedding Officiator]"; mes "The officiator searches through her records for your partner."; -- cgit v1.2.3-60-g2f50