戦闘とスクリプトの重なりバグ修正

diff --git a/Awars III/Awars III-Info.plist b/Awars III/Awars III-Info.plist
index ad69729..7a9ce2a 100644 (file)
--- a/Awars III/Awars III-Info.plist
+++ b/Awars III/Awars III-Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.657</string>
+       <string>0.658</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index fd54baa..6f8e970 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -350,6 +350,7 @@ ATTACK *attackTop2;
 UNIT *effCun;
 
 bool fuckingLoadBugFix;
+bool battleEndFlag;
 
 @interface Savedatadat : NSObject<NSCoding>{
 @public

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index be2c4a2..e5efb51 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1581,7 +1581,7 @@ ahhh:{}
         wtRdy = false;
         wtRdy2 = false;
         wtRdy3 = false;
-        
+        battleEndFlag = false;
         
         
         [self initUnitStatus];
@@ -1748,6 +1748,7 @@ ahhh:{}
                     //goto lolwtfshit;
                 }
                 if(U->C.S_C.WT <= 0 && !U->dead){//WTターン周り
+                    battleEndFlag = false;
                     U->C.S_C.WT = 0;
                     
                     
@@ -2298,12 +2299,17 @@ ahhh:{}
 
 -(void)EventFunc:(bool)eventLoopProcFlag{
     
-    
-    
     if(battleSetUp){
         pussyLoopFlag = false;
         fuckingLoadBugFix = true;
+
+    }
+    
+    
+    if(battleRdy){
+        return;
     }
+    
     if(battleBegin && !pussyLoopFlag){
         //wtRdy3 = true;
         bool proccessTrue = false;
@@ -2467,10 +2473,14 @@ ahhh:{}
                 else if(pushStanbyFlag){
                     MS.D->P->S4.lagFixFlag = false;
                 }
-                else if(!MS.D->P->S4.lagFixFlag && MS.D->ET4 == 0){
-                    MS.D->P->S4.lagFixFlag = true;
+                else if(battleEndFlag){
+                    MS.D->P->S4.lagFixFlag = false;
                 }
+                else if(!MS.D->P->S4.lagFixFlag && MS.D->ET4 == 0){
+                        MS.D->P->S4.lagFixFlag = true;
+                    }
                 }
+                
                 if(MS.D->P->S4.lagFixFlag){
                     //NSLog(@"%g", eventTime);
                     proccessTrue = false;
@@ -7171,6 +7181,7 @@ ahhh:{}
             CPUAttackSubmitFlag = false;
             battleSetUp = false;
             displayBattleCheckPanelFlag = 0;
+            battleEndFlag = true;
             break;
             
         default:

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 86e6488..cd64eeb 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -466,7 +466,7 @@
                     <textField verticalHuggingPriority="750" id="558">
                         <rect key="frame" x="18" y="443" width="126" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.657" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.658" id="559">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>