戦闘前の文章表示で、戦闘画面がチラ見されるのを改善

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index f2e00a7..9f38e6a 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -927,6 +927,7 @@ NSSound *SEsub;
 bool attackingWait;
 
 bool damnitFixFlag;
+bool crapBugFixFlag;
 
 bool eventEndFlag;
 int displayBattleCheckPanelFlag;

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index a2a52e2..e237825 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -3395,6 +3395,7 @@
     if(cpuAtkExtendFlag2){
         if(!battleSetUp){
             battleSetUp = true;
+            attackingWait = true;
             goto ahhh;
         }
         if(!battleSetUpIgnore){
@@ -3547,6 +3548,9 @@ ahhh:{}
                 if(Uselected->team == 2){
                     [tfArmy setStringValue:[NSString stringWithFormat:@"%@", P[1].name]];
                 }
+                if(Uselected->team == 1){
+                    [tfArmy setStringValue:[NSString stringWithFormat:@"%@", P[2].name]];
+                }
                 
                 [tfName setStringValue:[NSString stringWithFormat:@"%@", Uselected->C.name]];
                 [HPbarTF setStringValue:[NSString stringWithFormat:@"HP %g/%g", Uselected->C.S_C.HP, Uselected->C.S_M.HP]];
@@ -3655,6 +3659,10 @@ ahhh:{}
         [tfResource setStringValue:[NSString stringWithFormat:@"資源 %d", P[1].resource]];
         [tfFood setStringValue:[NSString stringWithFormat:@"食料 %d", P[1].food]];
         [tfMoney setStringValue:[NSString stringWithFormat:@"資金 %d", P[1].money]];
+    }else if(unitBreak->team == 1){
+        [tfResource setStringValue:[NSString stringWithFormat:@"資源 %d", P[2].resource]];
+        [tfFood setStringValue:[NSString stringWithFormat:@"食料 %d", P[2].food]];
+        [tfMoney setStringValue:[NSString stringWithFormat:@"資金 %d", P[2].money]];
     }
     }
     
@@ -3904,7 +3912,14 @@ ahhh:{}
         
     }
     
-    
+    if(extentBattleFlag || cpuAtkExtendFlag2){
+        if(!attackExtentFlag && !cpuAtkExtendFlag2)
+            attackingWait = true;
+        else
+            attackingWait = false;
+        if(battleRdy)
+            attackingWait = true;
+     }
     
     while(1){
         if(battleFlag && !battleSetUp){
@@ -3928,22 +3943,24 @@ ahhh:{}
                         if(attackExtentFlag || cpuAtkExtendFlag){
                             attackingWait = false;
                         }
-                    }
+                    }else
+                        return;
                 }
             
         }
         
         break;
     }
-
-    if((!attackExtentFlag && !cpuAtkExtendFlag))
-        if(!battleSettingFlag && attackingWait){
-            windowPoint.x = [mapWindow frame].origin.x;
-            windowPoint.y = [mapWindow frame].origin.y;
-            [battlePanel setFrameOrigin:windowPoint];
-            [battlePanel makeKeyAndOrderFront:nil];
-            [self setBattlePanel];
-        }
+    
+    if(initMapFlag && battleFlag)
+        if((!attackExtentFlag && !cpuAtkExtendFlag))
+            if(!battleSettingFlag && attackingWait){
+                windowPoint.x = [mapWindow frame].origin.x;
+                windowPoint.y = [mapWindow frame].origin.y;
+                [battlePanel setFrameOrigin:windowPoint];
+                [battlePanel makeKeyAndOrderFront:nil];
+                [self setBattlePanel];
+            }
     
     if(Utarget && attackingWait){
         
@@ -3999,9 +4016,13 @@ ahhh:{}
             bLoopFlag = false;
         }
     }
-    
+    damnitFixFlag = true;
     if(!datFileLoadCompFromTitle && initMapFlag){
         [self EventFunc:true];
+        if(crapBugFixFlag){
+            crapBugFixFlag = false;
+            return;
+        }
     }
     
     if(damnitFixFlag)
@@ -11894,8 +11915,7 @@ SKIP1:
     battleSettingFlag = false;
     
     attackingWait = false;
-    
-    damnitFixFlag = true;
+    crapBugFixFlag = true;
     
     [battlePanel close];
 }
@@ -11907,6 +11927,7 @@ SKIP1:
     battleSet2Flag = false;
     battleSettingFlag = false;
     
+    crapBugFixFlag = true;
     
     [battlePanel close];
 }

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 45b6a74..f853e64 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -2064,6 +2064,7 @@
             break;
         case MODE_CPU_BATTLE:
             battleFlag = true;
+            attackingWait = true;
             
             if(!Utarget){
                 CPUAttackFlag = false;