From a0b8884fe92f80f685f1ebbe95fb7d807df52155 Mon Sep 17 00:00:00 2001
From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Wed, 20 Apr 2016 03:32:36 +0900
Subject: [PATCH] =?utf8?q?=E3=81=A6=E3=82=99=E3=81=8D=E3=81=9F=E3=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Awars III/EventScene.m          | 10 ++++++----
 Awars III/ScenarioEditor.m      | 25 +++++++++++++------------
 Awars III/StringText.m          |  1 -
 Awars III/en.lproj/MainMenu.xib | 10 +++++-----
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index 15e24c7..bbd912b 100755
--- a/Awars III/EventScene.m	
+++ b/Awars III/EventScene.m	
@@ -45,7 +45,7 @@
     if(gameOverFlag2){
         
         dialogNumber = 1;
-        
+        bahBugFixFlag = false;
         startOrEndFlag = false;
         seFlag = false;
         startES = false;
@@ -55,9 +55,8 @@
     }
     
     if(backTitleFlag2){
-        
+        bahBugFixFlag = false;
         dialogNumber = 1;
-        
         startOrEndFlag = false;
         seFlag = false;
         startES = false;
@@ -135,6 +134,7 @@
             [esWindow setFrameOrigin:NSMakePoint(titleWindow.frame.origin.x, titleWindow.frame.origin.y)];
             [esWindow makeKeyAndOrderFront:nil];
             [titleWindow close];
+            bahBugFixFlag = false;
             esSceneProc++;
         }
     }
@@ -203,6 +203,7 @@
         cnt = 0;
         seFlag = false;
         startES = false;
+        bahBugFixFlag = false;
         return;
         
     }
@@ -216,6 +217,7 @@
                 return;
             }
             
+            bahBugFixFlag = false;
             saveFileFlag = false;
             dialogNumber = 1;
             fiValue = 0;
@@ -270,7 +272,7 @@
         evActive = true;
         FieldSceneInitFlag = true;
         initMapFlag = true;
-        
+        bahBugFixFlag = false;
         startOrEndFlag = true;
         cnt = 0;
         seFlag = false;
diff --git a/Awars III/ScenarioEditor.m b/Awars III/ScenarioEditor.m
index 6891b03..d92323f 100755
--- a/Awars III/ScenarioEditor.m	
+++ b/Awars III/ScenarioEditor.m	
@@ -485,7 +485,7 @@
         //おまんちん
         b->L->visibleInstant = b->L->visible;
         
-        *(TX[st].S->i->SEMA3flag+i0) = b->L->visible;
+        *(TX[st].S->i->SEMA3flag+i0) = b->L->visible+1;
         
         [self willChangeValueForKey:@"SEMA3"];
         [SEMA3 addObject:dict2];
@@ -5669,13 +5669,13 @@ I = Itop;
 {
     
     
-    if(TXCPY[STSNUM].fileName)
-    if(TXCPY[STSNUM].S)
-    if(TXCPY[STSNUM].S->i){
+    if(TX[STSNUM].fileName)
+    if(TX[STSNUM].S)
+    if(TX[STSNUM].S->i){
         
-        if(TXCPY[STSNUM].S->i->SEMA1row-1 < 0)
+        if(TX[STSNUM].S->i->SEMA1row-1 < 0)
             return;
-        if(TXCPY[STSNUM].S->i->SEMA2row-1 < 0)
+        if(TX[STSNUM].S->i->SEMA2row-1 < 0)
             return;
         
     I = Itop;
@@ -5691,7 +5691,7 @@ I = Itop;
         
         for (int i = 0;b && i <= TXCPY[STSNUM].S->i->SEMA2row-1; i++) {
             
-            if(i == TXCPY[STSNUM].S->i->SEMA2row-1){
+            if(i == TX[STSNUM].S->i->SEMA2row-1){
                 
                 if(layerIndex == b->z && b->img) [self DrawImage:b->img x:b->x y:b->y];
                 
@@ -5700,13 +5700,14 @@ I = Itop;
                     LAYER *lTop = l;
                     int i0 = 0;
                     while (l) {
-                        if(l->visibleInstant){
+                        if(1/*l->visibleInstant*/){
                           
-                            
-                            if(TXCPY[STSNUM].S->i->SEMA3flag)
-                                if(*(TXCPY[STSNUM].S->i->SEMA3flag + i0) > 1)
-                                    if(layerIndex == l->z && l->img)
+                            //NSLog(@"%d[%d]", i0, *(TX[STSNUM].S->i->SEMA3flag + i0));
+                            if(TX[STSNUM].S->i->SEMA3flag)
+                                if(*(TX[STSNUM].S->i->SEMA3flag + i0) > 1)
+                                    if(layerIndex == l->z && l->img){
                                         [self DrawImage:l->img x:l->x y:l->y];
+                                    }
                             
                             
                         }
diff --git a/Awars III/StringText.m b/Awars III/StringText.m
index e400a73..6949882 100644
--- a/Awars III/StringText.m	
+++ b/Awars III/StringText.m	
@@ -252,7 +252,6 @@
                 STtop = ST;
             }
             if(STItop) ST->i = STItop;
-            STItop = NULL;
             STIcnt = 0;
             if(ST)
             if(ST->S)
diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index f840589..030b35c 100755
--- a/Awars III/en.lproj/MainMenu.xib	
+++ b/Awars III/en.lproj/MainMenu.xib	
@@ -945,11 +945,6 @@
                 <binding destination="3826" name="contentArray" keyPath="EDhpFixListMA2" id="fGI-5j-zrV"/>
             </connections>
         </arrayController>
-        <arrayController id="lrw-EV-jZ9" userLabel="EDhpFixListAC3">
-            <connections>
-                <binding destination="3826" name="contentArray" keyPath="EDhpFixListMA3" id="YPb-Zd-AHi"/>
-            </connections>
-        </arrayController>
         <arrayController id="Efj-F8-NdQ" userLabel="eventGuildListAC">
             <connections>
                 <binding destination="3826" name="contentArray" keyPath="eventGuildListMA" id="SFi-tR-3G6"/>
@@ -965,6 +960,11 @@
                 <binding destination="3826" name="contentArray" keyPath="EDresourceMA2" id="E7o-55-Xgz"/>
             </connections>
         </arrayController>
+        <arrayController id="lrw-EV-jZ9" userLabel="EDhpFixListAC3">
+            <connections>
+                <binding destination="3826" name="contentArray" keyPath="EDhpFixListMA3" id="YPb-Zd-AHi"/>
+            </connections>
+        </arrayController>
         <arrayController id="58i-XA-5ch" userLabel="EDresourceAC3">
             <connections>
                 <binding destination="3826" name="contentArray" keyPath="EDresourceMA3" id="kj7-KP-Bzi"/>
-- 
2.11.0