diff options
| author | Ibrahem Hossam <ibrahem.h.basyone@gmail.com> | 2016-10-16 14:19:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 14:19:36 +0200 |
| commit | 8f2dace11eb6cce3fa9d4ff194db2a4b34753f91 (patch) | |
| tree | 5dd5748a4f12963b57253a6a946a583b07022e56 /npc/quests/guildrelay.txt | |
| parent | 1b1682ed243ef8304bfce1be7a70626c95720d93 (diff) | |
| parent | 062f2cf4235cf07481ecaf58682f37f2ad8928f8 (diff) | |
| download | hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.gz hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.bz2 hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.xz hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.zip | |
Merge pull request #1472 from Asheraf/getcharid
Change *getcharid to use constants
Diffstat (limited to 'npc/quests/guildrelay.txt')
| -rw-r--r-- | npc/quests/guildrelay.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index 55717e9ce..7cb580130 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -85,7 +85,7 @@ mes "head on your way.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (guildrelay_q == 100) { if (guildtime > 22) { @@ -1197,7 +1197,7 @@ } } else { - if (getcharid(2) == 0) { + if (getcharid(CHAR_ID_GUILD) == 0) { mes "[" + .@name$ + "]"; mes "You haven't joined"; mes "a guild yet? Why don't"; @@ -1264,7 +1264,7 @@ mes "head on your way.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Guild) > 0) { mes "[" + .@name$ + "]"; @@ -1768,7 +1768,7 @@ mes "there's no reason to be here.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Confidence) > 0) { mes "[" + .@name$ + "]"; @@ -2452,7 +2452,7 @@ mes "there's no reason to be here.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Peace) > 0) { mes "[" + .@name$ + "]"; @@ -2527,9 +2527,9 @@ close; } } - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (guildrelay_q == 91) { if (.@partymembercount == 6) { mes "[" + .@name$ + "]"; |