v0.655

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 2242085..ac8d9eb 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1252,6 +1252,7 @@
     
     }
     
+    [self EventFunc:true];
     
     if(extentBattleFlag){
         if(!battleSetUp){
@@ -1298,9 +1299,22 @@
         battleFlag = false;
     }
     
-ahhh:{}
+    if(battleSetUp){
+        if(!battleSetUpIgnore){
+            [self AttackDisplay];
+            
+            windowPoint.x = [mapWindow frame].origin.x;
+            windowPoint.y = [mapWindow frame].origin.y;
+            [battleWindow setFrameOrigin:windowPoint];
+            [battleWindow makeKeyAndOrderFront:nil];
+            battleRdy = true;
+        }else{
+            [mapWindow makeKeyAndOrderFront:nil];
+        }
+        
+    }
     
-    [self EventFunc:true];
+ahhh:{}
     
     if(setBattleModeFlag){
         if(!battleReadyUpFlag){battleReadyUpFlag = true;
@@ -1869,20 +1883,7 @@ ahhh:{}
     }
         break;
     }
-    if(battleSetUp){
-        if(!battleSetUpIgnore){
-            [self AttackDisplay];
-            
-        windowPoint.x = [mapWindow frame].origin.x;
-        windowPoint.y = [mapWindow frame].origin.y;
-        [battleWindow setFrameOrigin:windowPoint];
-        [battleWindow makeKeyAndOrderFront:nil];
-        battleRdy = true;
-        }else{
-            [mapWindow makeKeyAndOrderFront:nil];
-        }
-            
-    }
+  
     
     
     if(battleRdy){