From b22e05f982b19cc0ebca1e3ccf7d085beb5f7226 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Mon, 25 Oct 2010 23:46:43 +0200
Subject: fixed minor bugs in orum/waric

  * instead of "Intensity out of range" you die now.

  * spelling, only typos, no grammar corrected, since their grammar is weird.

  * header added to orum file.

Not done:
The bound checking is not corrected yet:
Instead of :

if (@offsetOne > 12) set @offsetOne, 1;
if (@offsetOne < 1) set @offsetOne, 12;

you should do:

if (@offsetOne > 12) set @offsetOne, @offsetOne - 12;
if (@offsetOne < 1) set @offsetOne, @offsetOne + 12;

This can handle with steps bigger than 1.

Collision layer of the bed in the empty cave must be fixed.

Should there be hints how to setup the torches anyway?
---
 npc/009-4/torches.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'npc/009-4/torches.txt')

diff --git a/npc/009-4/torches.txt b/npc/009-4/torches.txt
index d08e61db..2e8f4604 100644
--- a/npc/009-4/torches.txt
+++ b/npc/009-4/torches.txt
@@ -168,9 +168,9 @@ L_Show_Color:
 
 L_Wrong_Color:
 	set @Intensity, @TorchIntensity + 1;
+	if (@Intensity > 2) goto L_Failed;
 	callfunc("SetTorchIntensity");
 	callfunc("GetTorchIntensity");
-	if (@TorchIntensity > 2) goto L_Failed;
 	misceffect 5;
 	mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";
 	goto L_Color_Loop;
@@ -251,9 +251,9 @@ L_Show_Color:
 
 L_Wrong_Color:
 	set @Intensity, @TorchIntensity + 1;
+	if (@Intensity > 2) goto L_Failed;
 	callfunc("SetTorchIntensity");
 	callfunc("GetTorchIntensity");
-	if (@TorchIntensity > 2) goto L_Failed;
 	misceffect 5;
 	mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";
 	goto L_Color_Loop;
@@ -338,10 +338,10 @@ L_Show_Color:
 	goto L_Color_Loop;
 
 L_Wrong_Color:
-	set @Itensity, @TorchIntensity + 1;
+	set @Intensity, @TorchIntensity + 1;
+	if (@Intensity > 2) goto L_Failed;
 	callfunc("SetTorchIntensity");
 	callfunc("GetTorchIntensity");
-	if (@TorchIntensity > 2) goto L_Failed;
 	misceffect 5;
 	mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";
 	goto L_Color_Loop;
@@ -354,4 +354,4 @@ L_Failed:
 	callfunc("SetTorchIntensity");
 	heal -Hp, 0;
 	close;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-60-g2f50