またまたバグ改善

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index c643aca..25eb09d 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -200,6 +200,8 @@ bool bugFixFlag1;
 bool bugFixFlag2;
 bool bugFixFlag3;
 
+MAPSCRIPTD *MSDTO;
+
 bool messageEndFlag;
 
 bool SwitchONflag;

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 05770e3..f07314a 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1069,7 +1069,7 @@
     
     MS.D = MSDtop;
     
-    
+    MSDTO = MSDtop;
     MF[MFselectedRow+1].MS = MS;
     
     msgLvl = 0;
@@ -1468,15 +1468,17 @@
     }
     if(battleSetUp){
         if(!battleSetUpIgnore){
-        [self AttackDisplay];
-        
+            [self AttackDisplay];
+            
         windowPoint.x = [mapWindow frame].origin.x;
         windowPoint.y = [mapWindow frame].origin.y;
         [battleWindow setFrameOrigin:windowPoint];
         [battleWindow makeKeyAndOrderFront:nil];
         battleRdy = true;
-        battleSetUp = false;
+        }else{
+            [mapWindow makeKeyAndOrderFront:nil];
         }
+            
     }
     
     
@@ -1806,14 +1808,16 @@
         U = UTop;
     }
     
-
+    if(unitMoveEndFlag){
+        pussyLoopFlag = false;
+    }
     
     if(battleBegin && !pussyLoopFlag){
         bool proccessTrue = false;
         static bool onlyBigin = false;
         MAPSCRIPT MS = MF[MFselectedRow+1].MS;
         MAPSCRIPTD *MSDtop;
-        MSDtop = MS.D;
+        MSDtop = MSDTO;
         if(!MSDtop)
             goto w000p;
         
@@ -1840,12 +1844,11 @@
             while(MS.D){
                 if(MS.D->endFlag){
                     MS.D = MS.D->next;
-                    PtopFlag = false;
                 }
                 else
                     break;
             }
-            
+            PtopFlag = false;
             if(!MS.D) break;
             
             if(!PtopFlag){
@@ -2054,7 +2057,7 @@
             MS.D->P = MSDPtop;
             continue;
         }
-        MS.D = MSDtop;
+        MS.D = MSDTO;
    
         while(MS.D){
             
@@ -3374,6 +3377,8 @@ w000p:
 
 -(void)AttackDisplay{
 
+    if(battleRdy) return;
+    
     U = UTop;
     while (!(AUN[1] == U->number)) {
         U = U->next;
@@ -6062,7 +6067,7 @@ w000p:
             break;
         case 3:
             if(bLoopFlag) break;
-            
+            battleSetUp = false;
             battleSetFlag = false;
             battleFlag = false;
             battleRdy = false;
@@ -9643,6 +9648,8 @@ SKIP1:
                         
                     
                     }
+                    }else{
+                        trueFlag = false;
                     }
                     
                     
@@ -9677,6 +9684,8 @@ SKIP1:
                     
                     
                     
+                    }else{
+                        trueFlag = false;
                     }
                 }if(MS0->S4.subj && MS0->S4.build){
                 
@@ -9703,6 +9712,8 @@ SKIP1:
                         }
                 
                 
+                    }else{
+                        trueFlag = false;
                     }
                 }
             
@@ -9751,6 +9762,8 @@ SKIP1:
                             
                             
                         }
+                    }else{
+                        trueFlag = false;
                     }
                     
                     
@@ -9785,6 +9798,8 @@ SKIP1:
                         
                         
                         
+                    }else{
+                        trueFlag = false;
                     }
                 }if(MS0->S4.subj && MS0->S4.build){
                     
@@ -9811,6 +9826,8 @@ SKIP1:
                         }
                         
                         
+                    }else{
+                        trueFlag = false;
                     }
                 }
             }else if(MS0->S4.team == 2){
@@ -9855,6 +9872,8 @@ SKIP1:
                             
                             
                         }
+                    }else{
+                        trueFlag = false;
                     }
                 
                 }else if(MS0->S4.subj && MS0->S4.obje){
@@ -9882,6 +9901,8 @@ SKIP1:
                             
                         }
 
+                    }else{
+                        trueFlag = false;
                     }
                 }if(MS0->S4.subj && MS0->S4.build){
                     
@@ -9908,6 +9929,8 @@ SKIP1:
                         }
                         
                         
+                    }else{
+                        trueFlag = false;
                     }
                 }
             }