建設のバグでクラッシュするのを改善

diff --git a/Awars III/Awars III-Info.plist b/Awars III/Awars III-Info.plist
index 1fb1f71..73c22fa 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.585</string>
+       <string>0.586</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 8263f4a..54cd429 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -304,7 +304,7 @@
     
     if(buildCaptureFlag && unitMoveEndFlag){
         
-        BTop = B;
+        B = BTop;
         while (B) {
             if(B->x == Uselected->x && B->y == Uselected->y){
                 if(Uselected->team == 0) B->team = 0;
@@ -339,7 +339,7 @@
             U = U->next;
         }U = UTop;
         
-        BTop = B;
+        B = BTop;
         while(B){
             if(B->team < 0) B->img = B->C.img;
             if(B->team == 0)
@@ -759,7 +759,7 @@
     
     if(buildNum[possionX][possionY] >= 0 && unitNum[possionX][possionY] < 0 && !moveFlag){
         //NSLog(@"くりとりすとおちんちん");
-        BTop = B;
+        B = BTop;
         while (B) {
             if(B->x == possionX && B->y == possionY){
                 researchTeam = -1;
@@ -800,7 +800,7 @@
         wtPx = possionX;
         wtPy = possionY;
         wtMovedFlag = true;
-        BTop = B;
+        B = BTop;
         while (B) {
             if(B->x == possionX && B->y == possionY && B->C.capture){
                 buildCaptureFlag = true;
@@ -1811,7 +1811,7 @@
                     
                     
                     
-                    BTop = B;
+                    B = BTop;
                     while (B) {
                         if(B->x == wtPx && B->y == wtPy && B->C.capture){
                             buildCaptureFlag = true;
@@ -1854,6 +1854,8 @@
                 cpuMODE = MODE_CPU_ATTACK;
             }
             NSLog(@"test[%d,%d][%d,%d]", unitBreak->x, unitBreak->y, possionX, possionY);
+            possionX = unitBreak->x;
+            possionY = unitBreak->y;
             break;
         case MODE_CPU_ATTACK:
             if(!CPUAttackFlag){
@@ -1983,7 +1985,7 @@
                     }
                     unitBreak->C.S = unitBreak->C.S->next;
                 }unitBreak->C.S = ST;
-                
+                NSLog(@"BTop %@", BTop->C.name);
                 B->C.invisible = false;
                 cpuBuildDoneFlag = false;
                 cpuMODE = MODE_CPU_EMPLOY;
@@ -2603,6 +2605,9 @@
                                                 [self addBuildStatusfix];
                                                 ST6type = i;
                                                 unitBreak->C.S = ST;
+                                                if(g_target_x == unitBreak->y && g_target_y == unitBreak->x){
+                                                    unitNoMoveStanbyFlag = true;
+                                                }
                                                 return;
                                             }
                                         }
@@ -2704,6 +2709,9 @@
                                  [self addBuildStatusfix];
                                 ST6type = i;
                                 unitBreak->C.S = S6T;
+                                if(g_target_x == unitBreak->y && g_target_y == unitBreak->x){
+                                    unitNoMoveStanbyFlag = true;
+                                }
                                 return;
                             }
                         }
@@ -2761,6 +2769,9 @@
                                  [self addBuildStatusfix];
                                 ST6type = i;
                                 unitBreak->C.S = S6T;
+                                if(g_target_x == unitBreak->y && g_target_y == unitBreak->x){
+                                    unitNoMoveStanbyFlag = true;
+                                }
                                 return;
                             }
                         }
@@ -2817,6 +2828,9 @@
                                  [self addBuildStatusfix];
                                 ST6type = i;
                                 unitBreak->C.S = S6T;
+                                if(g_target_x == unitBreak->y && g_target_y == unitBreak->x){
+                                    unitNoMoveStanbyFlag = true;
+                                }
                                 return;
                             }
                         }
@@ -2835,7 +2849,7 @@
 -(void)addBuildStatusfix{
     
     int omgCnt = 0;
-    BTop = B;
+    B = BTop;
     while (B->next) {omgCnt++;
         B = B->next;
     }
@@ -2909,7 +2923,7 @@
         wtPx = g_target_y;
         wtPy = g_target_x;
         wtMovedFlag = true;
-        BTop = B;
+        B = BTop;
         while (B) {
             if(B->x == wtPx && B->y == wtPy && B->C.capture){
                 buildCaptureFlag = true;
@@ -3132,7 +3146,7 @@
                 
                 //[self DrawImage:BC[buildNum[bx][by]].img x:(bx-1)*32 y:(by-1)*32 cx:bx cy:by f:1.0];
                 
-                BTop = B;
+                B = BTop;
                 while (B) {
                     if(B->x == bx && B->y == by) break;
                     B = B->next;

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 6b5f1b6..4e4b4ac 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -384,7 +384,7 @@
                     <textField verticalHuggingPriority="750" id="558">
                         <rect key="frame" x="17" 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.585" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.586" 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"/>