diff options
author | hemagx <ibrahem.h.basyone@gmail.com> | 2016-09-02 04:56:54 +0200 |
---|---|---|
committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-09-02 04:56:54 +0200 |
commit | 79e7a41e6652b553024b51576cc37015deed950c (patch) | |
tree | 57780b1ecc7c5ae125be1c89406f8db1e00a581b /npc/re/cities/malaya.txt | |
parent | 0f1d03f505fdc03533122db8ba19fa55f64f11b7 (diff) | |
parent | 0f1d0507eb95cf07ce7eb66d89ad9853938612e6 (diff) | |
download | hercules-79e7a41e6652b553024b51576cc37015deed950c.tar.gz hercules-79e7a41e6652b553024b51576cc37015deed950c.tar.bz2 hercules-79e7a41e6652b553024b51576cc37015deed950c.tar.xz hercules-79e7a41e6652b553024b51576cc37015deed950c.zip |
Merge pull request #1412 from Asheraf/strcharinfo
change *strcharinfo to use constants
Closes #1412 as merged
Diffstat (limited to 'npc/re/cities/malaya.txt')
-rw-r--r-- | npc/re/cities/malaya.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index c8171b9d6..afe816a3e 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -184,16 +184,16 @@ OnBingx2: end; OnTouch: if (getcharid(1)) { - if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { + if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) { donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; } if (rand(1,5)%2) { switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { - case 1: $ma_name04$ = strcharinfo(0); break; - case 5: $ma_name05$ = strcharinfo(0); break; - case 9: $ma_name06$ = strcharinfo(0); break; + case 1: $ma_name04$ = strcharinfo(PC_NAME); break; + case 5: $ma_name05$ = strcharinfo(PC_NAME); break; + case 9: $ma_name06$ = strcharinfo(PC_NAME); break; } } donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; @@ -246,7 +246,7 @@ OnTouch: .@pass = 1; } if (.@pass) { - if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { + if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) { donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; @@ -256,16 +256,16 @@ OnTouch: case 2: case 3: case 4: - $ma_name04$ = strcharinfo(0); + $ma_name04$ = strcharinfo(PC_NAME); break; case 6: case 7: case 8: - $ma_name05$ = strcharinfo(0); + $ma_name05$ = strcharinfo(PC_NAME); break; case 10: case 11: - $ma_name06$ = strcharinfo(0); + $ma_name06$ = strcharinfo(PC_NAME); break; } } |