Numerous fixes. Magic level 0 should be fully operational now.

1 files changed, 18 insertions, 16 deletions

diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1_Woodland_Hills/injured-mouboo.txt
index c017a35a..c248b8e6 100644
--- a/npc/012-1_Woodland_Hills/injured-mouboo.txt
+++ b/npc/012-1_Woodland_Hills/injured-mouboo.txt
@@ -108,15 +108,17 @@ L_give:
         setarray @choice_eat, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;
 
         set @n, 0;
+        set @ct, 0;
 L_nloop:
         set @k, @items[@n];
         if (countitem(@k) == 0)
 		goto L_nloop_skip;
 
         set @name$, getitemname(@k);
-        set @choice$[@n], @name$;
-        set @choice_idx[@n], @k;
-        set @choice_eat[@n], @itemeat[@n];
+        set @choice$[@ct], @name$;
+        set @choice_idx[@ct], @k;
+        set @choice_eat[@ct], @itemeat[@n];
+        set @ct, @ct + 1;
 
 L_nloop_skip:
 
@@ -124,19 +126,18 @@ L_nloop_skip:
         if (@n < @items_nr)
 		goto L_nloop;
 
-        menu
-		@choice$[0], -
-		@choice$[1], -
-		@choice$[2], -
-		@choice$[3], -
-		@choice$[4], -
-		@choice$[5], -
-		@choice$[6], -
-		@choice$[7], -
-		@choice$[8], -
-		@choice$[9], -
-		@choice$[10], -
-		@choice$[11], -;
+        menu @choice$[0], -,
+             @choice$[1], -,
+             @choice$[2], -,
+             @choice$[3], -,
+             @choice$[4], -,
+             @choice$[5], -,
+             @choice$[6], -,
+             @choice$[7], -,
+             @choice$[8], -,
+             @choice$[9], -,
+             @choice$[10], -,
+             @choice$[11], -;
 
         set @menu, @menu - 1;
         set @choice, @choice_idx[@menu];
@@ -163,6 +164,7 @@ L_consume:
 
 	mes "[Injured Mouboo]";
         mes "Unfortunately, it seems to have had no effect.";
+        next;
 	goto L_menu;
 
 L_do_heal: