diff options
| author | Haru <haru@dotalux.com> | 2015-12-18 05:48:23 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-18 05:53:48 +0100 |
| commit | a782aa1540b63d5fffd55d835f6f30ee0c53d0f1 (patch) | |
| tree | 4d20c27f191e91adabb029342683687bce5ca4d5 /npc/other | |
| parent | dbe5f2237cada6a261e297b60857dc305860a88d (diff) | |
| download | hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.gz hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.bz2 hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.xz hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.zip | |
Replaced numeric values with UNITTYPE_ constants in getmapxy
Follow-up to dbe5f2237cada6a261e297b60857dc305860a88d
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/other')
| -rw-r--r-- | npc/other/CashShop_Functions.txt | 4 | ||||
| -rw-r--r-- | npc/other/gm_npcs.txt | 2 | ||||
| -rw-r--r-- | npc/other/monster_race.txt | 4 | ||||
| -rw-r--r-- | npc/other/poring_war.txt | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index ef53ef858..17ce48173 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -57,8 +57,8 @@ function script F_CashStore { // - No arguments. function script F_CashPartyCall { warp "Random",0,0; - if(getpartyleader(getcharid(1),2) == getcharid(0)) { - getmapxy .@mapl$, .@xl, .@yl, 0; + if (getpartyleader(getcharid(1),2) == getcharid(0)) { + getmapxy(.@mapl$, .@xl, .@yl, UNITTYPE_PC); warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$; } return; diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index 9bc79ca77..54e37a2bd 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -41,7 +41,7 @@ function script F_GM_NPC { // To set a minimum GM level to access the NPCs, edit the line below. if (getgmlevel() < 99) {/* TODO: perhaps better to just add a group permission? [Ind] */ // Log the event. - getmapxy(.@map$,.@x,.@y,1); + getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC); logmes strcharinfo(0)+" attempted to access GM NPC "+strnpcinfo(0)+" ("+.@map$+","+.@x+","+.@y+")."; end; } diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 24de8a1f8..eec6593e5 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -241,7 +241,7 @@ OnInit: OnEnable: emotion e_gasp; enablenpc strnpcinfo(0); - getmapxy(.@m$,.@x,.@y,1); + getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC); setarray .@mob[1], R_PORING,R_LUNATIC,R_SAVAGE_BABE,R_DESERT_WOLF_B,R_DEVIRUCHI,R_BAPHOMET_; monster "p_track01",58,.@y,"The "+ F_Ord() +" Racer", .@mob[F_Num()],1,strnpcinfo(0)+"::OnMyMobDead"; end; @@ -1750,7 +1750,7 @@ p_track02,76,38,1 script Exit Guide#double 4_M_NFMAN,{ OnEnable: enablenpc strnpcinfo(0); setarray .@mob[1], R_PORING,R_LUNATIC,R_SAVAGE_BABE,R_DESERT_WOLF_B,R_DEVIRUCHI,R_BAPHOMET_; - getmapxy(.@m$,.@x,.@y,1); + getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC); .@num = MN(); monster "p_track02",58,.@y,"Monster "+.@num,.@mob[.@num],1,strnpcinfo(0)+"::OnMyMobDead"; end; diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index f3a1df913..b3b6466ad 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -318,7 +318,7 @@ poring_w01,96,97,3 script Sweet Devi#wop 4_DEVIRUCHI,{ } OnPCLogoutEvent: - getmapxy .@map$,.@x,.@y,0; + getmapxy(.@map$, .@x, .@y, UNITTYPE_PC); if (.@map$ == "poring_w02") { if (WoP_SaveMap$ != "") { savepoint WoP_SaveMap$,WoP_SaveMap_X,WoP_SaveMap_Y; @@ -332,7 +332,7 @@ OnPCLogoutEvent: end; OnPCDieEvent: - getmapxy .@map$,.@x,.@y,0; + getmapxy(.@map$, .@x, .@y, UNITTYPE_PC); if (.@map$ == "poring_w02" && wop_team) { if (getsavepoint(0) != "poring_w02" && WoP_SaveMap$ == "") { WoP_SaveMap$ = getsavepoint(0); @@ -349,7 +349,7 @@ OnPCDieEvent: end; OnPCKillEvent: - getmapxy .@map$,.@x,.@y,0; + getmapxy(.@map$, .@x, .@y, UNITTYPE_PC); if (.@map$ == "poring_w02" && wop_team) { getnameditem War_Badge,rid2name(killedrid); } |