diff options
| author | Asheraf <acheraf1998@gmail.com> | 2016-10-09 14:46:30 +0100 |
|---|---|---|
| committer | Asheraf <acheraf1998@gmail.com> | 2016-10-16 12:51:22 +0100 |
| commit | 062f2cf4235cf07481ecaf58682f37f2ad8928f8 (patch) | |
| tree | 30fd352940f19ba058705ca338a61339e10e4ead /npc/other/marriage.txt | |
| parent | 9c777dfc4ce6d84e7da89d896baa05786e574a99 (diff) | |
| download | hercules-062f2cf4235cf07481ecaf58682f37f2ad8928f8.tar.gz hercules-062f2cf4235cf07481ecaf58682f37f2ad8928f8.tar.bz2 hercules-062f2cf4235cf07481ecaf58682f37f2ad8928f8.tar.xz hercules-062f2cf4235cf07481ecaf58682f37f2ad8928f8.zip | |
Change *getcharid to use constants
Diffstat (limited to 'npc/other/marriage.txt')
| -rw-r--r-- | npc/other/marriage.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index ea43b347f..bbd659420 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -577,7 +577,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ if (!getpartnerid()) { if (!$@wedding) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_MALE) { @@ -648,7 +648,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ } else if ($@wedding == 1) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_FEMALE) { @@ -689,7 +689,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "Will you marry "+$@wed_groom$+"?"; next; if (select("Yes, I do.", "^FF0000No.^000000") == 1) { - if (isloggedin(getcharid(3,$@wed_groom$))) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$))) { if (marriage($@wed_groom$)) { //Call Wedding effect wedding; @@ -697,12 +697,12 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ sc_start SC_WEDDING,3600000,1; getitem Bride_Ring,1; //Give ring to Groom, and change to wedding sprite. - attachrid(getcharid(3,$@wed_groom$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$)); sc_start SC_WEDDING,3600000,1; getitem Bridegroom_Ring,1; detachrid; //Switch Script progression back to Bride - attachrid(getcharid(3,$@wed_bride$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_bride$)); cutin "wedding_bomars02",2; mapannounce "prt_church","I now pronounce you, "+$@wed_groom$+" and "+$@wed_bride$+", husband and wife.",bc_map; mes "[Vomars]"; |