diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/014-1 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/014-1')
| -rw-r--r-- | world/map/npc/014-1/wedding-officiator.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt index f6bf7c9d..61810504 100644 --- a/world/map/npc/014-1/wedding-officiator.txt +++ b/world/map/npc/014-1/wedding-officiator.txt @@ -7,7 +7,7 @@ next; L_main: - if (getpartnerid2(0)) + if (getpartnerid2()) goto L_main_married; menu "What exactly do you do?", L_explain_self, @@ -228,7 +228,7 @@ L_do_divorce: goto L_divorce_nomoney; - if divorce(0) goto L_DidDivorce; + if (divorce()) goto L_DidDivorce; mes "[Wedding Officiator]"; mes "The officiator searches through her records for your partner."; |