diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-01 12:20:01 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-01 12:20:01 -0700 |
| commit | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (patch) | |
| tree | f6538b5b413443a9d2aba60ce1ef2c3fdcad7ed9 | |
| parent | 9480d6bb5c30feb915407c23bc9daee91cbc3381 (diff) | |
| download | serverdata-3226368a1cd36e4d6e47302493fe5e0e91dddef3.tar.gz serverdata-3226368a1cd36e4d6e47302493fe5e0e91dddef3.tar.bz2 serverdata-3226368a1cd36e4d6e47302493fe5e0e91dddef3.tar.xz serverdata-3226368a1cd36e4d6e47302493fe5e0e91dddef3.zip | |
Fix some bugs in the marriage scrcipts
| -rw-r--r-- | conf/magic.conf | 1 | ||||
| -rw-r--r-- | npc/014-1_Woodland/wedding-officiator.txt | 3 |
2 files changed, 3 insertions, 1 deletions
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."; |