From b519dcef374c8079d164b5493f6c9b2199b241c9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 24 Feb 2015 19:59:13 +0300
Subject: Use in test map addremovemapmask.

Also improve a bit npc1 menu.
---
 npc/test/npc1.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'npc/test')

diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index fc904714d..2c0dc8b4f 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -26,29 +26,36 @@ test,10,10,0	script	npc1	800,3,3,{
         return;
     }
 
+L_Start:
     switch (select("show area:map:change sex:change npc direction:quest test:add cart:remove cart"))
     {
         case 1:
             areatest;
             break;
         case 2:
+            while(1)
+            {
             .@mask = getmapmask("test");
             mes "current mask: " + str(.@mask);
-            switch (select("show sand:show grass:show fog:hide fog"))
+            switch (select("show sand:show grass:show fog:hide fog:back"))
             {
                 case 1:
-                    setmapmask "test", (.@mask | (4 + 8)) ^ 8;
+                    addremovemapmask "test", 4, 8;
                     break;
                 case 2:
-                    setmapmask "test", (.@mask | (4 + 8)) ^ 4;
+                    addremovemapmask "test", 8, 4;
                     break;
                 case 3:
-                    setmapmask "test", .@mask | 2;
+                    addmapmask "test", 2;
                     break;
                 case 4:
-                    setmapmask "test", (.@mask | 2) ^ 2;
+                    removemapmask "test", 2;
+                    break;
+                case 5:
+                    goto L_Start;
                     break;
             }
+            }
             break;
 
         case 3:
-- 
cgit v1.2.3-60-g2f50