CPU戦闘ボタンバグしゅうせい

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 476da05..7feb5f7 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1921,6 +1921,26 @@
         U = UTop;
     }
     
+    
+    if(unitBreak){
+    if(unitBreak->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2){
+        unitBreak->CPU = true;
+        cpuAImodeflag = true;
+        //NSLog(@"OMFG");
+    }else if(unitBreak->team == 0 && MF[MFselectedRow+1].MS.playerSet1 == 2){
+        unitBreak->CPU = true;
+        cpuAImodeflag = true;
+        //NSLog(@"OMFG");
+    }else if(unitBreak->team == 1){
+        unitBreak->CPU = true;
+        cpuAImodeflag = true;
+        //NSLog(@"OMFG");
+    }
+    else{
+        unitBreak->CPU = false;
+        cpuAImodeflag = false;
+    }
+    }
     if(unitMoveEndFlag){
         pussyLoopFlag = false;
     }
@@ -2250,27 +2270,6 @@
         battleSetUpIgnore = false;
     }
 w000p:
-
-    if(!unitBreak)
-        return;
-
-    if(unitBreak->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2){
-        unitBreak->CPU = true;
-        cpuAImodeflag = true;
-        //NSLog(@"OMFG");
-    }else if(unitBreak->team == 0 && MF[MFselectedRow+1].MS.playerSet1 == 2){
-        unitBreak->CPU = true;
-        cpuAImodeflag = true;
-        //NSLog(@"OMFG");
-    }else if(unitBreak->team == 1){
-        unitBreak->CPU = true;
-        cpuAImodeflag = true;
-        //NSLog(@"OMFG");
-    }
-    else{
-        unitBreak->CPU = false;
-        cpuAImodeflag = false;
-    }
     
     if(CPUAttackSubmitFlag){
         battleFlag = true;