summaryrefslogtreecommitdiff
path: root/world/map/npc/009-4/barriers.txt
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-04-13 10:16:10 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-04-13 15:10:57 -0700
commit9c9034116fab44475c9bad57b727a374fbd01ebf (patch)
tree65a628a11e3b06294f9906257f7dfba4f82eefe5 /world/map/npc/009-4/barriers.txt
parentdf95c80ad1c48f3563a13d0bf22872ffc0bb7d29 (diff)
downloadserverdata-9c9034116fab44475c9bad57b727a374fbd01ebf.tar.gz
serverdata-9c9034116fab44475c9bad57b727a374fbd01ebf.tar.bz2
serverdata-9c9034116fab44475c9bad57b727a374fbd01ebf.tar.xz
serverdata-9c9034116fab44475c9bad57b727a374fbd01ebf.zip
Refactor torches to avoid a bug and make more consistent and obvious
Also avoid some silliness with rand()
Diffstat (limited to 'world/map/npc/009-4/barriers.txt')
-rw-r--r--world/map/npc/009-4/barriers.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9bc486d9..78635c54 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -15,11 +15,11 @@ L_Error:
function|script|SetBarrierColor|{
if (@Barrier < 0 || @Barrier > 2)
goto L_Error;
- if (@Color < 0 || @Color > 12)
+ if (@BarrierColor <= 0 || @BarrierColor > 12)
goto L_Error2;
set @Mask, (15 << (4 * @Barrier));
- set OrumQuestBarrier, (OrumQuestBarrier & (~(@Mask))) | @Color << (4 * @Barrier);
+ set OrumQuestBarrier, (OrumQuestBarrier & (~(@Mask))) | @BarrierColor << (4 * @Barrier);
return;
L_Error: