バグを修正、範囲攻撃CPUバグ、クラッシュバグ

diff --git a/Awars III.xcodeproj/project.pbxproj b/Awars III.xcodeproj/project.pbxproj
index 1b57ae2..4c0e0d3 100755 (executable)
--- a/Awars III.xcodeproj/project.pbxproj
+++ b/Awars III.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
                C63622E41A57456B006A20BF /* ucb55.png in Resources */ = {isa = PBXBuildFile; fileRef = C63622E01A57456B006A20BF /* ucb55.png */; };
                C63622E51A57456B006A20BF /* ucb56.png in Resources */ = {isa = PBXBuildFile; fileRef = C63622E11A57456B006A20BF /* ucb56.png */; };
                C63E4F941817D9C5005CA225 /* セレクター（選択）.png in Resources */ = {isa = PBXBuildFile; fileRef = C63E4F931817D9C5005CA225 /* セレクター（選択）.png */; };
+               C643D5391C31B1AC00527AF6 /* ターゲット（目標）.png in Resources */ = {isa = PBXBuildFile; fileRef = C643D5381C31B1AC00527AF6 /* ターゲット（目標）.png */; settings = {ASSET_TAGS = (); }; };
                C644DD3F16DE1ABC001AC138 /* セレクター（移動）.png in Resources */ = {isa = PBXBuildFile; fileRef = C644DD3E16DE1ABC001AC138 /* セレクター（移動）.png */; };
                C64607B91859B21800B67FCB /* t-sm_2247_004.gif in Resources */ = {isa = PBXBuildFile; fileRef = C64607B81859B21800B67FCB /* t-sm_2247_004.gif */; };
                C64FC3A616C4B61400E3C08A /* エトナ.png in Resources */ = {isa = PBXBuildFile; fileRef = C64FC3A516C4B61400E3C08A /* エトナ.png */; };
@@ -369,6 +370,7 @@
                C63622E01A57456B006A20BF /* ucb55.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ucb55.png; sourceTree = "<group>"; };
                C63622E11A57456B006A20BF /* ucb56.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ucb56.png; sourceTree = "<group>"; };
                C63E4F931817D9C5005CA225 /* セレクター（選択）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "セレクター（選択）.png"; sourceTree = "<group>"; };
+               C643D5381C31B1AC00527AF6 /* ターゲット（目標）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ターゲット（目標）.png"; sourceTree = "<group>"; };
                C644DD3E16DE1ABC001AC138 /* セレクター（移動）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "セレクター（移動）.png"; sourceTree = "<group>"; };
                C64607B81859B21800B67FCB /* t-sm_2247_004.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "t-sm_2247_004.gif"; sourceTree = "<group>"; };
                C64FC3A516C4B61400E3C08A /* エトナ.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "エトナ.png"; sourceTree = "<group>"; };
@@ -841,6 +843,7 @@
                C6E8DA32167C8F8D00BFEC32 /* img */ = {
                        isa = PBXGroup;
                        children = (
+                               C643D5381C31B1AC00527AF6 /* ターゲット（目標）.png */,
                                C629F5EB18BD54C2001A42B0 /* アクセラレータ.jpg */,
                                C64607B81859B21800B67FCB /* t-sm_2247_004.gif */,
                                C6C808C016DE79BA006C72F5 /* ucb1.png */,
@@ -1296,6 +1299,7 @@
                                C6DC3C3F1A7ADCB0007514D1 /* to08.jpg in Resources */,
                                C6CDEB16169D4E6000088937 /* uc4.png in Resources */,
                                C6CDEB17169D4E6000088937 /* uc5.png in Resources */,
+                               C643D5391C31B1AC00527AF6 /* ターゲット（目標）.png in Resources */,
                                C6CDEB18169D4E6000088937 /* uc6.png in Resources */,
                                C6CDEB19169D4E6000088937 /* uc7.png in Resources */,
                                C6774C31188DFEB9005CBE99 /* lc16.png in Resources */,

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 122430e..4adff0b 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -2189,8 +2189,8 @@ w000p:
     U = UTop;
     
     
-    if(battleFlag){
-    }
+    if(Utarget){
+    
     if(battleFlag &&
        ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
         (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
@@ -2215,9 +2215,10 @@ w000p:
         [battleWindow makeKeyAndOrderFront:nil];
         [battlePanel close];
     }
-    
+    }
+    if(Utarget){
     if(battleRdy &&
-       ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
+       ((Utarget && MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
         (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
         (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2)
         )
@@ -2232,7 +2233,7 @@ w000p:
         
        bLoopFlag = false;
     }
-    
+    }
     U = UTop;
     
 
@@ -6151,7 +6152,14 @@ w000p:
             pussyLoopFlag = false;
             cpuAtkExtendFlag3 = false;
             cpuOMFGmoveATKfixFlag = false;
+            UA = NULL;
             Utarget = NULL;
+            cpuIsAttackingFlag = false;
+            for(int g = 0;g < chipWidth;g++){
+                for(int k = 0;k < chipHeight;k++){
+                    g_attackRangeExtent[g][k] = 0;
+                }
+            }
             break;
             
         default:

diff --git a/Awars III/FieldView.h b/Awars III/FieldView.h
index c3bf336..3a5572f 100755 (executable)
--- a/Awars III/FieldView.h
+++ b/Awars III/FieldView.h
@@ -132,7 +132,7 @@ bool cpuAtkExtendFlag;
 bool cpuAtkExtendFlag2;
 bool cpuAtkExtendFlag3;
 bool cpuOMFGmoveATKfixFlag;
-
+bool cpuIsAttackingFlag;
 ATTACK *UA;
 
 @interface FieldView : NSView
@@ -149,6 +149,8 @@ ATTACK *UA;
     NSImage *chipTeam1;
     NSImage *chipTeam2;
     
+    NSImage *chipUtarg;
+    
     NSPoint drugPoint;
     
     NSArray *fileDataArray;

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index fa8cd80..3130db8 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -34,6 +34,7 @@
         chipTeam0 = [[self LoadImage:@"ハイライト（青）.png"] retain];
         chipTeam1 = [[self LoadImage:@"ハイライト（黄）.png"] retain];
         chipTeam2 = [[self LoadImage:@"ハイライト（赤）.png"] retain];
+        chipUtarg = [[self LoadImage:@"ターゲット（目標）.png"] retain];
         
         n1 = [[self LoadImage:@"num1"] retain];
         n2 = [[self LoadImage:@"num2"] retain];
@@ -131,6 +132,7 @@
             unitMoveEndFlag = true;
             unitMoveBugFixFlag = false;
             pussyLoopFlag = false;
+            if(UA) cpuIsAttackingFlag = true;
             i0 = 0;
             
             U = UTop;
@@ -1514,6 +1516,10 @@
                     crCAL1 = 0;
                 }
                 
+                if(UA->extent > 0){
+                    cpuAtkExtendFlag = true;
+                }
+                
                 while (unitBreak->C.A && UA != unitBreak->C.A) {
                     unitBreak->C.A = unitBreak->C.A->next;
                     crCAL1++;
@@ -1722,6 +1728,8 @@
             
             if(unitMoveEndFlag){
                 pushStanbyFlag = true;
+                UA = NULL;
+                cpuIsAttackingFlag = false;
             }
             
             if(setBattleModeFlag)
@@ -1858,6 +1866,8 @@
                 CPUAttackFlag2 = false;
                 //Utarget = NULL;
                 cpuMODE = MODE_CPU_IDLE;
+                cpuIsAttackingFlag = false;
+                UA = NULL;
                 return;
             }else{
                 unitCPUAttackFlag = true;
@@ -2071,6 +2081,7 @@
             unitNoMoveFlag = true;
             CPUAttackFlag = true;
             CPUAttackFlag2 = true;
+            cpuIsAttackingFlag = true;
             goto w000p;
         }
             break;
@@ -2124,10 +2135,10 @@
     
     unitBreak->atkRange = unitBreak->atkRange+1 - g_enemyRange[g_target_x][g_target_y];
 
-        ATTACK *uca = unitBreak->C.A;
         
         
-        if(uca->extent > 0){
+        if(UA)
+        if(UA->extent > 0){
             if(1){
                 U = UTop;
                 int i = 1;
@@ -2545,10 +2556,11 @@
                 [self DrawImage:chipAttack x:(bx-1)*32 y:(by-1)*32 cx:bx cy:by f:0.8];
             }
             
+            /*
             if((g_attackRangeExtent[bx][by] > 0 && attackExtentFlag) ||
                (g_attackRangeExtent[bx][by] > 0 && cpuAtkExtendFlag3)){
                 [self DrawImage:chipAttack x:(bx-1)*32 y:(by-1)*32 cx:bx cy:by f:0.8];
-            }
+            }*/
             
             if(g_summonRange[bx][by] > 0 && summonFlag){
                 [self DrawImage:chipSummon x:(bx-1)*32 y:(by-1)*32 cx:bx cy:by f:0.8];
@@ -2590,6 +2602,17 @@
             
         }
     }
+    
+    if(cpuIsAttackingFlag || (UA && unitMoveEndFlag)){
+        for (int x = 1; x <= chipWidth;x++) {
+            for(int y = 1;y <= chipHeight;y++){
+                if(g_attackRangeExtent[y][x] > 0)
+                    [self DrawImage:chipAttack x:(y-1)*32 y:(x-1)*32 cx:bx cy:by f:0.6];
+            }
+    
+    
+        }
+    }
     /*
     if(cpuModeATTACKflag)
         for (int x = 0; x <= chipWidth;x++) {
@@ -2623,8 +2646,8 @@
     
     if(chipTargetFlag) [self DrawImage:chipTarget x:(wtPx-1)*32 y:(wtPy-1)*32 cx:0 cy:0 f:1.0];
     
-    if(Utarget)
-        [self DrawImage:chipAttack x:(Utarget->x-1)*32 y:(Utarget->y-1)*32 cx:bx cy:by f:0.6];
+    if(Utarget && (cpuIsAttackingFlag || (UA && unitMoveEndFlag)))
+        [self DrawImage:chipUtarg x:(Utarget->x-1)*32 y:(Utarget->y-1)*32 cx:bx cy:by f:1.0];
    //[self DrawImage:chipSelect x:(2-1)*32 y:(1-1)*32 cx:0 cy:0 f:1.0];
     
     /*