攻撃開始のビハバーを直した

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index 8bb0dcb..f2e00a7 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -926,6 +926,8 @@ NSSound *SEsub;
 
 bool attackingWait;
 
+bool damnitFixFlag;
+
 bool eventEndFlag;
 int displayBattleCheckPanelFlag;
 

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 3c68d55..a2a52e2 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -3376,12 +3376,10 @@
         [battleWindow close];
     }
     
-    if(!assholeLoadBugFix && !datFileLoadCompFromTitle && initMapFlag)
-        [self EventFunc:true];
-    
     if(extentBattleFlag){
         if(!battleSetUp){
             battleSetUp = true;
+            attackingWait = true;
             goto ahhh;
         }
         if(!battleSetUpIgnore){
@@ -3926,6 +3924,10 @@ ahhh:{}
                         attackingWait = true;
                         vaginaCnt = 0;
                         oopsCnt = 80;
+                        
+                        if(attackExtentFlag || cpuAtkExtendFlag){
+                            attackingWait = false;
+                        }
                     }
                 }
             
@@ -3998,8 +4000,11 @@ ahhh:{}
         }
     }
     
+    if(!datFileLoadCompFromTitle && initMapFlag){
+        [self EventFunc:true];
+    }
     
-    
+    if(damnitFixFlag)
     if(battleSetUp && fuckingLoadBugFix && Uselected && !attackingWait){
         if(!battleSetUpIgnore && fuckingLoadBugFix){
             [self AttackDisplay];
@@ -4011,10 +4016,12 @@ ahhh:{}
         }else if(battleSetUpIgnore){
             [mapWindow makeKeyAndOrderFront:nil];
         }else{
+            /*
             windowPoint.x = [mapWindow frame].origin.x;
             windowPoint.y = [mapWindow frame].origin.y;
             [battleWindow setFrameOrigin:windowPoint];
-            [battleWindow makeKeyAndOrderFront:nil];
+            [battleWindow makeKeyAndOrderFront:nil];*/
+            
         }
         
     }
@@ -4531,9 +4538,10 @@ ahhh:{}
     }
     
     
-    if(battleSetUp){
+    if(attackingWait){
         return;
     }
+
     
     if(battleBegin && !pussyLoopFlag){
         //wtRdy3 = true;
@@ -4603,7 +4611,6 @@ ahhh:{}
             
             if(!MS.D->P){
                 MS.D->endFlag = true;
-                fuckingLoadBugFix = true;
                 messageDialog = false;
                 [self setMessage:NULL];
                 MS.D->P = MSDPtop;
@@ -4795,7 +4802,6 @@ ahhh:{}
                 
             if(proccessTrue)
                 switch (proccesType) {
-                        
                     case ENTIRE_MAP:
                         MS.D->P = [self setEvent:MS.D->P];
                         
@@ -4969,8 +4975,8 @@ ahhh:{}
         if(!eventLoopProcFlag){
             pussyCumsOnlyOnceFlag = true;
         
-        }
-         
+        }else
+            fuckingLoadBugFix = true;
         //wtRdy3 = false;
     }
 
@@ -11887,9 +11893,9 @@ SKIP1:
     battleSet2Flag = false;
     battleSettingFlag = false;
     
-    fuckingLoadBugFix = true;
     attackingWait = false;
     
+    damnitFixFlag = true;
     
     [battlePanel close];
 }
@@ -11901,8 +11907,6 @@ SKIP1:
     battleSet2Flag = false;
     battleSettingFlag = false;
     
-    fuckingLoadBugFix = true;
-    
     
     [battlePanel close];
 }
@@ -12182,9 +12186,10 @@ SKIP1:
     
     if(!messageDialog){
         [self closeMessage];
+        damnitFixFlag = true;
     }else if(MS0->S1.str){
         [self openMessage];
-    
+        damnitFixFlag = false;
     NSString *string = @"";
     
         string = [MS0->S1.str retain];