From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Wed, 4 May 2016 10:01:05 +0000 (+0900)
Subject: 戦闘のキャンセル決定最適化
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d33fa2dd04f9cabebef728f9b121d07b51e2f3fb;p=awarsiii%2FAwarsIV.git

戦闘のキャンセル決定最適化
---

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index 291c794..546f8fe 100755
--- a/Awars III/FieldScene.h	
+++ b/Awars III/FieldScene.h	
@@ -363,6 +363,7 @@ NSSound *BGMsub;
 NSSound *SEsub;
 
 bool eventEndFlag;
+int displayBattleCheckPanelFlag;
 
 bool gameOverFlag;
 bool gameOverFlag2;
diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 763aaa6..75f52c6 100755
--- a/Awars III/FieldScene.m	
+++ b/Awars III/FieldScene.m	
@@ -2182,9 +2182,10 @@
     
     w000p:
     
-    if(CPUAttackSubmitFlag){
+    
+    if(displayBattleCheckPanelFlag == 1){
+        displayBattleCheckPanelFlag = 2;
         battleFlag = true;
-        CPUAttackSubmitFlag = false;
         windowPoint.x = [mapWindow frame].origin.x;
         windowPoint.y = [mapWindow frame].origin.y;
         [atkPanel setFrameOrigin:windowPoint];
@@ -4737,6 +4738,10 @@
             [battleCancelBtn setEnabled:YES];
             [battleCancelBtn setTransparent:NO];
         }
+        if(displayBattleCheckPanelFlag == 0) displayBattleCheckPanelFlag = 1;
+    }else{
+        [battleCancelBtn setEnabled:YES];
+        [battleCancelBtn setTransparent:NO];
     }
     
     U = UTop;
@@ -7044,6 +7049,8 @@
             btHitExtendMove2 = 0;
             baseDistanceCompFlag = false;
             battleVeryBegunFlag = false;
+            CPUAttackSubmitFlag = false;
+            displayBattleCheckPanelFlag = 0;
             break;
             
         default:
diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index ce6cfce..89cdc00 100755
--- a/Awars III/FieldView.m	
+++ b/Awars III/FieldView.m	
@@ -1886,6 +1886,7 @@
             wtRdy = true;
             wtRdy2 = true;
             */
+            
             unitMoveEndFlag = false;
             cpuAtkExtendFlag = false;
             cpuAtkExtendFlag2 = false;