戦闘指定で会話が混じると、表示が変に振る舞うのを改善

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index 5cd4eff..60eeca8 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -84,8 +84,8 @@
             mapInitFlag = true;
             bahBugFixFlag = false;
             
-            if(!saveDataLoadedFlag)
-                [MapViewInst loadMapChip];
+            
+            [MapViewInst loadMapChip];
             mapInitFlag = false;
             [nameTF setStringValue:@""];
             [dialogTF setStringValue:@""];

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index b304f8a..cb0b43a 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -445,6 +445,7 @@ ATTACK *attackTop2;
 UNIT *effCun;
 
 bool fuckingLoadBugFix;
+bool assholeLoadBugFix;
 bool battleEndFlag;
 
 int oopsCnt;

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 4a70677..607c702 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1986,7 +1986,6 @@
 }
 
 -(void)EventLoopFS:(NSTimer*)time{
-    
 
     
     
@@ -2017,13 +2016,14 @@
     
     }
     
-    [self EventFunc:true];
-    
     if(!fuckingLoadBugFix){
         battleRdy = false;
         [battleWindow close];
     }
     
+    if(!assholeLoadBugFix)
+        [self EventFunc:true];
+    
     if(extentBattleFlag){
         if(!battleSetUp){
             battleSetUp = true;
@@ -2333,6 +2333,16 @@ ahhh:{}
     
     if(initMapFlag && datFileLoadCompFromTitle){
     
+        for(int i = 0;i<=1000;i++){
+            for(int j = 0;j<= 1000;j++){
+                buildNum[i][j] = -1;
+                unitNum[i][j] = -1;
+                loadNum[i][j] = -1;
+                buildTeam[i][j] = -1;
+                unitTeam[i][j] = -1;
+            }
+        }
+        
         [self initUnitStatusDat];
         [self initBuildStatusDat];
         [self initMapscript];
@@ -2517,7 +2527,14 @@ ahhh:{}
     }
 
     
-    NSLog(@"%p", UTop);
+    //NSLog(@"%p", UTop);
+    if(battleWindowFlag){battleFlag = true; battleWindowFlag = false;
+        
+    }
+    
+    if(battleRdy && battleSetUp && fuckingLoadBugFix && !battleSetUpIgnore){
+        [self DisplayMessage];
+    }
     
     if(wtRdy3)
         return;
@@ -2655,9 +2672,7 @@ ahhh:{}
     lolwtfshit:{}
     U = UTop;
     
-    if(battleWindowFlag){battleFlag = true; battleWindowFlag = false;
-        
-    }
+    
     
     while(1){
     if(battleFlag){
@@ -2703,10 +2718,7 @@ ahhh:{}
   
     
     
-    if(battleRdy && battleSetUp && fuckingLoadBugFix && !battleSetUpIgnore){
-        [self DisplayMessage];
-    }
-    fuckingLoadBugFix = false;
+    
 
     
     if(buildSelectedFlag){
@@ -3110,8 +3122,6 @@ ahhh:{}
     
     if(battleSetUp){
         pussyLoopFlag = false;
-        fuckingLoadBugFix = true;
-
     }
     
     
@@ -3159,8 +3169,10 @@ ahhh:{}
                     break;
             }
             PtopFlag = false;
-            if(!MS.D) break;
-            
+            if(!MS.D) {
+                break;
+            }
+        
             if(!PtopFlag){
                 MSDPtop = MS.D->P;
                 PtopFlag = true;
@@ -3175,6 +3187,7 @@ ahhh:{}
                 }
             if(!MS.D->P){
                 MS.D->endFlag = true;
+                fuckingLoadBugFix = true;
                 messageDialog = false;
                 [self setMessage:NULL];
                 MS.D->P = MSDPtop;
@@ -7203,6 +7216,8 @@ ahhh:{}
         DUNnum = 1;
     }
     
+    assholeLoadBugFix = true;
+    
     switch (messageProcess) {
         case 0:
             if(bLoopFlag) break;
@@ -8292,6 +8307,9 @@ ahhh:{}
                 wtRdy = false;
             wtRdy2 = false;
             }
+            
+            fuckingLoadBugFix = false;
+            
             battleSetUp = false;
             battleSetFlag = false;
             battleFlag = false;
@@ -8339,6 +8357,7 @@ ahhh:{}
             battleSetUp = false;
             displayBattleCheckPanelFlag = 0;
             battleEndFlag = true;
+            assholeLoadBugFix = false;
             break;
             
         default:
@@ -10441,7 +10460,10 @@ SKIP1:
     battleSet1Flag = false;
     battleSet2Flag = false;
     battleSettingFlag = false;
-
+    
+    fuckingLoadBugFix = true;
+    
+    
     [battlePanel close];
 }
 
@@ -10453,6 +10475,9 @@ SKIP1:
     battleSet2Flag = false;
     battleSettingFlag = false;
     
+    fuckingLoadBugFix = true;
+    
+    
     [battlePanel close];
 }