スクリプトバグ修正

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index d1284b1..dec0735 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -2326,9 +2326,9 @@
                 }
             
             
-            if(eventTime >= MS.D->ET4){
+            if(eventTime == MS.D->ET4 || MS.D->ET4 == 0){
                 proccessTrue = true;
-                if(MS.D->ETtype == 4){
+                if(MS.D->ET4 > 0){
                     
                     double deltaET = floor(MS.D->ET2) - floor(MS.D->ET1);
                     int deltaR = 0;
@@ -2372,7 +2372,7 @@
             
             if(EventFailFlag  || !proccessTrue){
                 while (MS.D->P) {
-                    MS.D->P->endFlag = true;
+                    //MS.D->P->endFlag = true;
                     MS.D->P = MS.D->P->next;
                 }
                 MS.D->P = MSDPtop;

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index c3d730b..51c97eb 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -504,8 +504,6 @@
         return;
     }
     
-    pussyLoopFlag = true;
-    
     if(coolTime)
         return;
     

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 3719f43..0b880d0 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -2320,7 +2320,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="1720">
-                            <rect key="frame" x="465" y="1" width="16" height="480"/>
+                            <rect key="frame" x="466" y="1" width="15" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
@@ -8968,7 +8968,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
-                            <rect key="frame" x="466" y="1" width="15" height="480"/>
+                            <rect key="frame" x="465" y="1" width="16" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>