From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Tue, 12 Jan 2016 03:04:50 +0000 (+0900)
Subject: 戦闘画面ボタンバグ修正
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7ddfd6c2548f7d46235b3cedb275ec663ee211d6;p=awarsiii%2FAwarsIV.git

戦闘画面ボタンバグ修正
---

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 26f030d..6db5231 100755
--- a/Awars III/FieldScene.m	
+++ b/Awars III/FieldScene.m	
@@ -1461,7 +1461,10 @@
             
             while (U) {
                 if(!U->dead) U->C.S_C.WT -= 1;
-                if(U->dead) U->C.S_C.WT = 999999;
+                if(U->dead) {
+                    U->C.S_C.WT = 999999;
+                    //goto lolwtfshit;
+                }
                 if(U->C.S_C.WT <= 0 && !U->dead){//WTターン周り
                     U->C.S_C.WT = 0;
                     wtUnitNum = U->number;
@@ -11619,6 +11622,9 @@ SKIP1:
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        if(MF[MFselectedRow+1].MS.playerSet1 == 2)
+            U->CPU = true;
+    
     }
     if(unitTeam[x][y] == 2 || unitTeam[x][y] == 3){
         U->team = 2;
@@ -11626,6 +11632,9 @@ SKIP1:
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        if(MF[MFselectedRow+1].MS.playerSet2 == 2)
+            U->CPU = true;
+        
     }
     if(unitTeam[x][y] == 4 || unitTeam[x][y] == 5){
         U->team = 1;
@@ -11633,6 +11642,7 @@ SKIP1:
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        U->CPU = true;
     }
     if(unitTeam[x][y] == -1){
         U->team = -1;
@@ -11640,6 +11650,7 @@ SKIP1:
             U->joinArmyFromNext = false;
             U->persuasion = true;
         }
+        U->CPU = true;
     }
     unitNum[x][y] = u.chipNumb;
     [self SetUnitStatus:unitNum[x][y]];
diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 8dc5e7d..e56e1a7 100755
--- a/Awars III/FieldView.m	
+++ b/Awars III/FieldView.m	
@@ -399,7 +399,7 @@
         if(unitBreak->dead){
             unitNum[unitBreak->x][unitBreak->y] = -1;
             unitBreak->C.S_C.WT = 999999;
-            wtRdy = false;
+            //wtRdy = false;
             stanbyFlag = true;
             wtMovedFlag = true;
         }
@@ -1809,6 +1809,7 @@
             if(battleFlag || battleRdy || battleSetUp)
                 return;
             
+            wtRdy = true;
             unitMoveEndFlag = false;
             CPUAttackFlag = false;
             CPUAttackFlag2 = false;
@@ -1925,6 +1926,7 @@
                 return;
             }else{
                 //unitNoMoveFlag = false;
+                CPUAttackFlag = true;
                 unitCPUAttackFlag = true;
                 cpuMODE = MODE_CPU_BATTLE;
                 return;
@@ -2254,6 +2256,7 @@
 }
 
 -(void)addUnitStatusFix{
+    //おまんちん
     int omgCnt = 0;
     UTop = U;
     while (U->next) {omgCnt++;
@@ -2283,6 +2286,9 @@
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        if(MF[MFselectedRow+1].MS.playerSet1 == 2){
+            U->CPU = true;
+        }
     }
     if(unitTeam[possionX][possionY] == 2 || unitTeam[possionX][possionY] == 3){
         U->team = 2;
@@ -2290,6 +2296,9 @@
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        if(MF[MFselectedRow+1].MS.playerSet2 == 2){
+            U->CPU = true;
+        }
     }
     if(unitTeam[possionX][possionY] == 4 || unitTeam[possionX][possionY] == 5){
         U->team = 1;
@@ -2297,6 +2306,7 @@
             U->joinArmyFromNext = true;
             U->persuasion = true;
         }
+        U->CPU = true;
     }
     if(unitTeam[possionX][possionY] == -1){
         U->team = -1;
@@ -2304,6 +2314,7 @@
             U->joinArmyFromNext = false;
             U->persuasion = true;
         }
+        U->CPU = true;
     }
     [self SetUnitStatusFix:unitNum[possionX][possionY]];
     unitColorInitFlag = true;
@@ -2374,7 +2385,7 @@
 }
 
 -(void)cpuSearchEnemy{
-    
+    //おまんちん
     if(!unitBreak->C.nameID) return;
     
     moveFlag = false;