From d27c20cd5c32cbe0471145d6f75b5471ad574ec8 Mon Sep 17 00:00:00 2001
From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Wed, 10 Feb 2016 11:16:05 +0900
Subject: [PATCH] =?utf8?q?=E3=81=A1=E3=82=87=E3=81=84=E3=81=97=E3=82=85?=
 =?utf8?q?=E3=81=86=08=E3=81=9B=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Awars III/FieldView.h |  2 ++
 Awars III/FieldView.m | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Awars III/FieldView.h b/Awars III/FieldView.h
index a0e5d9d..60b67da 100755
--- a/Awars III/FieldView.h	
+++ b/Awars III/FieldView.h	
@@ -141,6 +141,8 @@ ATTACK *UA;
 
 int ST6type;
 
+bool CPUturn;
+
 @interface FieldView : NSView
 {
     NSTimer *time;
diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 1909e4a..7918534 100755
--- a/Awars III/FieldView.m	
+++ b/Awars III/FieldView.m	
@@ -368,7 +368,9 @@
         
         if(!cpuTurnEndFlag && wtRdy && unitBreak->C.S_C.WT == 0){
             [self modeCPUturn];
-            
+            CPUturn = true;
+        }else{
+            CPUturn = false;
         }
         
     }
@@ -498,6 +500,8 @@
     
     if(waitSwtichFlag) return;
     
+    if(CPUturn) return;
+    
     if(messageDialog){
         
         
@@ -1844,13 +1848,13 @@
             else NSLog(@"Utarg NULL");
             cpuModeMOVEflag = true;
             if(unitNoMoveStanbyFlag){
-                static int waitTimer = 30;
+                static int waitTimer = 20;
                 cpuModeATTACKflag = true;
                 if (waitTimer > 0) {
                     waitTimer--;
                     return;
                 }else{
-                    waitTimer = 30;
+                    waitTimer = 20;
                     unitNoMoveFlag = true;
                     U = UTop;
                     
@@ -1955,13 +1959,13 @@
                 
                 if(cpuModeBATTLEendFlag){
                     
-                    static int waitTimer0 = 30;
+                    static int waitTimer0 = 20;
                     
                     if (waitTimer0 > 0) {
                         waitTimer0--;
                         return;
                     }else{
-                        waitTimer0 = 30;
+                        waitTimer0 = 20;
                     pushStanbyFlag = true;
                     
                     cpuModeMOVEflag = false;
@@ -1983,13 +1987,13 @@
             }
             else if((CPUAttackFlag && unitMoveEndFlag )|| CPUAttackFlag2){
                 
-                static int waitTimer = 30;
+                static int waitTimer = 20;
                 
                 if (waitTimer > 0) {
                     waitTimer--;
                     return;
                 }else{
-                    waitTimer = 30;
+                    waitTimer = 20;
                     wtAttackedFlag = true;
                     if(!cpuAtkExtendFlag){
                         CPUAttackSubmitFlag = true;
@@ -2010,13 +2014,13 @@
                 }
             }else if((CPUAttackFlag && !unitMoveEndFlag)){
                 
-                static int waitTimer = 30;
+                static int waitTimer = 20;
                 
                 if (waitTimer > 0) {
                     waitTimer--;
                     return;
                 }else{
-                    waitTimer = 30;
+                    waitTimer = 20;
                     wtAttackedFlag = true;
                     if(!cpuAtkExtendFlag){
                         CPUAttackSubmitFlag = true;
-- 
2.11.0