diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
| commit | dfa96a49bbdcb0938746adf8d2da7ffac00a6222 (patch) | |
| tree | 6baedebcd87a44cac5f8b4fb15ed0a016fc58d26 /world/map/npc/009-4/barriers.txt | |
| parent | 6f2c9210413a68524aaebe2c1a0bd9a54dbcd74a (diff) | |
| parent | 262912f0c8545a82fe2fbf68699cc53d65384b1d (diff) | |
| download | serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.gz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.bz2 serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.xz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.zip | |
Merge remote-tracking branch 'origin/master' into waric
Diffstat (limited to 'world/map/npc/009-4/barriers.txt')
| -rw-r--r-- | world/map/npc/009-4/barriers.txt | 4 |
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: |