条件が反映されない場合があるのを改善

diff --git a/Awars III/Awars III-Info.plist b/Awars III/Awars III-Info.plist
index 8cac24e..e1f9e5f 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.654</string>
+       <string>0.655</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index a68da19..2242085 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1300,6 +1300,8 @@
     
 ahhh:{}
     
+    [self EventFunc:true];
+    
     if(setBattleModeFlag){
         if(!battleReadyUpFlag){battleReadyUpFlag = true;
             
@@ -1705,7 +1707,7 @@ ahhh:{}
 
     
     
-    [self EventFunc:true];
+    
     if(wtRdy3)
         return;
     U = UTop;
@@ -2252,12 +2254,16 @@ ahhh:{}
         battleSet1Flag = false;
         battleSet2Flag = false;
         battleSettingFlag = false;
-        [self AttackDisplay];
-        windowPoint.x = [mapWindow frame].origin.x;
-        windowPoint.y = [mapWindow frame].origin.y;
-        [battleWindow setFrameOrigin:windowPoint];
-        [battleWindow makeKeyAndOrderFront:nil];
-        [battlePanel close];
+        battleSetUp = true;
+        /*
+        if(!battleSetUpIgnore){
+            [self AttackDisplay];
+            windowPoint.x = [mapWindow frame].origin.x;
+            windowPoint.y = [mapWindow frame].origin.y;
+            [battleWindow setFrameOrigin:windowPoint];
+            [battleWindow makeKeyAndOrderFront:nil];
+            [battlePanel close];
+        }*/
     }
     }
     if(Utarget){
@@ -2439,16 +2445,20 @@ ahhh:{}
             if(!MS.D->endFlag)
             if(eventTime == MS.D->ET4 || MS.D->ET4 == 0 || MS.D->initialDeleyedFlag){
                 
-                if(MS.D->P->type == 6)
+                if(MS.D->P->type == 6){
                 if(eventTime == MS.D->ET4){
                     MS.D->P->S4.lagFixFlag = false;
-                }else if(unitMoveEndFlag){
+                }
+                else if(unitMoveEndFlag){
                     MS.D->P->S4.lagFixFlag = false;
-                }else if(battleSetUp){
+                }
+                else if(battleSetUp){
                     MS.D->P->S4.lagFixFlag = false;
-                }else if(!MS.D->P->S4.lagFixFlag && MS.D->ET4 == 0){
+                }
+                else if(!MS.D->P->S4.lagFixFlag && MS.D->ET4 == 0){
                     MS.D->P->S4.lagFixFlag = true;
                 }
+                }
                 if(MS.D->P->S4.lagFixFlag){
                     goto jonny;
                 }
@@ -9232,6 +9242,7 @@ SKIP1:
     battleSet2Flag = false;
     battleSettingFlag = false;
     battleRdy = false;
+    if(!battleSetUpIgnore)
     [self AttackDisplay];
     
     windowPoint.x = [mapWindow frame].origin.x;

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 748277c..4041cc6 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.654" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.655" 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"/>