summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/clear_vars.txt2
-rw-r--r--npc/items/warpTowels.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index 116cd163..3788f762 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -35,7 +35,7 @@ function script ClearVariables {
}
if (MAGIC_EXPERIENCE) {
setq2(MagicQuest_Healing, MAGIC_EXPERIENCE >> 24);
- MAGIC_EXP = (MAGIC_EXPERIENCE & 65535);
+ MAGIC_EXP = abs(MAGIC_EXPERIENCE & 65535);
MAGIC_EXPERIENCE = 0;
/* Convert the old magic system to new magic system */
setq1(MagicQuest_DarkMage,
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index a6ffa8d1..3d181090 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -2,11 +2,11 @@ function script WarpTowel {
@seconds = TowelLastUsed - (gettimetick(2) - 1200);
if (@seconds > 0 && !is_trusted())
goto L_DontPanic;
- .@zone = getmapinfo(MAPINFO_ZONE);
- if (.@zone == "Jail")
+ .@zone$ = getmapinfo(MAPINFO_ZONE);
+ if (.@zone$ == "Jail")
goto L_Prison;
// Zone will never be MMO, though
- if (.@zone == "MMO" || .@zone == "Event")
+ if (.@zone$ == "MMO" || .@zone$ == "Event")
goto L_Forbid;
if (getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
goto L_Forbid;