ゲーム開始設定修正

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index dec0735..4f1b4d9 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1237,9 +1237,9 @@
         battleFlag = false;
     }
     
-    if(!setBattleModeFlag){
+    if(setBattleModeFlag){
         if(!battleReadyUpFlag){battleReadyUpFlag = true;
-        
+            
             P[0].resource = 500;
             P[0].food = 500;
             P[0].money = 500;
@@ -1249,12 +1249,7 @@
             P[2].resource = 500;
             P[2].food = 500;
             P[2].money = 500;
-        
-        }
-    }
-    
-    if(setBattleModeFlag){
-        if(!battleReadyUpFlag){battleReadyUpFlag = true;
+            
         [battleReadyUpPN1 setStringValue:P[0].name];
         [battleReadyUpPN2 setStringValue:P[1].name];
         
@@ -1287,13 +1282,7 @@
         [battleReadyUpFood2 setIntValue:P[1].food];
         [battleReadyUpMoney2 setIntValue:P[1].money];
         
-        if(MF[MFselectedRow+1].MS.playerSet1 == 0){
-            [battleReadyUpMAN1A setEnabled:YES];
-            [battleReadyUpMAN1B setEnabled:YES];
-            [battleReadyUpMAN1A setState:1];
-            [battleReadyUpMAN1B setState:0];
-            
-        }else if(MF[MFselectedRow+1].MS.playerSet1 == 1){
+        if(MF[MFselectedRow+1].MS.playerSet1 == 1){
             [battleReadyUpMAN1A setEnabled:NO];
             [battleReadyUpMAN1B setEnabled:NO];
             [battleReadyUpMAN1A setState:1];
@@ -1303,15 +1292,15 @@
             [battleReadyUpMAN1B setEnabled:NO];
             [battleReadyUpMAN1A setState:0];
             [battleReadyUpMAN1B setState:1];
+        }else{
+            MF[MFselectedRow+1].MS.playerSet1 = 1;
+            [battleReadyUpMAN1A setEnabled:YES];
+            [battleReadyUpMAN1B setEnabled:YES];
+            [battleReadyUpMAN1A setState:1];
+            [battleReadyUpMAN1B setState:0];
         }
         
-        if(MF[MFselectedRow+1].MS.playerSet2 == 0){
-            [battleReadyUpMAN2A setEnabled:YES];
-            [battleReadyUpMAN2B setEnabled:YES];
-            [battleReadyUpMAN2A setState:1];
-            [battleReadyUpMAN2B setState:0];
-            
-        }else if(MF[MFselectedRow+1].MS.playerSet2 == 1){
+        if(MF[MFselectedRow+1].MS.playerSet2 == 1){
             [battleReadyUpMAN2A setEnabled:NO];
             [battleReadyUpMAN2B setEnabled:NO];
             [battleReadyUpMAN2A setState:1];
@@ -1321,20 +1310,31 @@
             [battleReadyUpMAN2B setEnabled:NO];
             [battleReadyUpMAN2A setState:0];
             [battleReadyUpMAN2B setState:1];
+        }else{
+            MF[MFselectedRow+1].MS.playerSet2 = 1;
+            [battleReadyUpMAN2A setEnabled:YES];
+            [battleReadyUpMAN2B setEnabled:YES];
+            [battleReadyUpMAN2A setState:1];
+            [battleReadyUpMAN2B setState:0];
         }
+            
         }
+        
         if(retardhelp1){
             if([battleReadyUpMAN1A state] != 0)
                 MF[MFselectedRow+1].MS.playerSet1 = 1;
             else
                 MF[MFselectedRow+1].MS.playerSet1 = 2;
+            retardhelp2 = false;
         }
         if(retardhelp2){
             if([battleReadyUpMAN2A state] != 0)
                 MF[MFselectedRow+1].MS.playerSet2 = 1;
             else
                 MF[MFselectedRow+1].MS.playerSet2 = 2;
+            retardhelp2 = false;
         }
+        
         return;
     }
     

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 0b880d0..3719f43 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="466" y="1" width="15" height="480"/>
+                            <rect key="frame" x="465" y="1" width="16" 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="465" y="1" width="16" height="480"/>
+                            <rect key="frame" x="466" y="1" width="15" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>