ユニットが読み込めなくなる時があるのを改善

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index 58fb4bd..5cd4eff 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -94,7 +94,6 @@
             FieldSceneInitFlag = true;
             initMapFlag = true;
             EventViewDraw = true;
-            UTop = NULL;
             if(MF[MFselectedRow+1].MS.battleSetMode && !saveDataLoadedFlag){
                 setBattleModeFlag = true;
                 NSPoint windowPoint;
@@ -252,7 +251,6 @@
         [MapViewInst loadMapChip];
         mapInitFlag = false;
         [esWindow close];
-        UTop = NULL;
         if(MF[MFselectedRow+1].MS.battleSetMode){
             setBattleModeFlag = true;
             NSPoint windowPoint;

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index fcdb2e3..4a70677 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -2355,7 +2355,6 @@ ahhh:{}
         wtRdy3 = false;
         battleEndFlag = false;
         initStatusFlag = true;
-        unitBreak = U;
         TeamCountFlag = true;
         cpuTurnEndFlag = false;
         unitColorInitFlag = true;
@@ -2518,7 +2517,7 @@ ahhh:{}
     }
 
     
-    
+    NSLog(@"%p", UTop);
     
     if(wtRdy3)
         return;
@@ -4563,14 +4562,14 @@ ahhh:{}
 -(void)addUnitStatus{
     registerNum++;
     int omgCnt = 0;
-    UTop = U;
+    U = UTop;
     while (U->next) {omgCnt++;
         U = U->next;
     }
     U->next = calloc(1, sizeof(UNIT));
     U = U->next;
     U->next = NULL;
-    if(omgCnt == 0) UTop = U;
+    if(omgCnt == 0) U = UTop;
     U->number = registerNum;
     
     for(int i = 0;i < UCN;i++){
@@ -4632,14 +4631,14 @@ ahhh:{}
 -(void)addSummonStatus{
     registerNum++;
     int omgCnt = 0;
-    UTop = U;
+    U = UTop;
     while (U->next) {omgCnt++;
         U = U->next;
     }
     U->next = calloc(1, sizeof(UNIT));
     U = U->next;
     U->next = NULL;
-    if(omgCnt == 0) UTop = U;
+    if(omgCnt == 0) U = UTop;
     
     
     U->x = possionX;
@@ -4701,7 +4700,7 @@ ahhh:{}
 -(void)initUnitStatusDat{
     U = NULL;
     UTop = NULL;
-    for(int i = 0;i < registerNum;i++){
+    for(int i = 0;i < sdd2[datRow].registerNum;i++){
         if(i == 0){
             U = calloc(1, sizeof(UNIT));
             UTop = U;
@@ -4844,7 +4843,7 @@ ahhh:{}
 -(void)initBuildStatusDat{
     B = NULL;
     BTop = NULL;
-    for(int i = 0;i < registerNumB;i++){
+    for(int i = 0;i < sdd2[datRow].registerNumB;i++){
         if(i == 0){
             B = calloc(1, sizeof(BUILD));
             BTop = B;
@@ -11112,7 +11111,7 @@ SKIP1:
             int team2num = 0;
             if(MS0->S4.team == 0){
                 if(!MS0->S4.objeFlag && !MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 0 && !U->dead)
                         team0num++;
@@ -11152,7 +11151,7 @@ SKIP1:
             
             }else if(MS0->S4.team == 1){
                 if(!MS0->S4.objeFlag && !MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 1 && !U->dead)
                         team1num++;
@@ -11190,7 +11189,7 @@ SKIP1:
                 }
             }else if(MS0->S4.team == 2){
                 if(!MS0->S4.objeFlag && !MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 2 && !U->dead)
                         team2num++;
@@ -11487,7 +11486,7 @@ SKIP1:
             int team2num = 0;
             if(MS0->S4.team == 0){
                 if(!MS0->S4.unitTypeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 0 && !U->dead)
                         team0num++;
@@ -11530,7 +11529,7 @@ SKIP1:
                 
             }else if(MS0->S4.team == 1){
                 if(!MS0->S4.unitTypeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 1 && !U->dead)
                         team1num++;
@@ -11571,7 +11570,7 @@ SKIP1:
                 }
             }else if(MS0->S4.team == 2){
                 if(!MS0->S4.unitTypeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 2 && !U->dead)
                         team2num++;
@@ -12038,7 +12037,7 @@ SKIP1:
             int team2num = 0;
             if(MS0->S4.team == 0){
                 if(!MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 0 && !U->dead)
                         team0num++;
@@ -12072,7 +12071,7 @@ SKIP1:
                 
             }else if(MS0->S4.team == 1){
                 if(!MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 1 && !U->dead)
                         team1num++;
@@ -12104,7 +12103,7 @@ SKIP1:
                 }
             }else if(MS0->S4.team == 2){
                 if(!MS0->S4.placeFlag){
-                UTop = U;
+                U = UTop;
                 while (U) {
                     if(U->team == 2 && !U->dead)
                         team2num++;
@@ -13738,14 +13737,14 @@ SKIP1:
 -(void)addAppearanceStatus:(UNITCHIP)u x:(int)x y:(int)y{
     
     int omgCnt = 0;
-    UTop = U;
+    U = UTop;
     while (U->next) {omgCnt++;
         U = U->next;
     }
     U->next = calloc(1, sizeof(UNIT));
     U = U->next;
     U->next = NULL;
-    if(omgCnt == 0) UTop = U;
+    if(omgCnt == 0) U = UTop;
     U->number = registerNum;
     U->chipNumber = -1;
     U->chipNumberL = -1;

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 97f7bc9..5e914f9 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -2564,14 +2564,14 @@
 -(void)addUnitStatusFix{
     //おまんちん
     int omgCnt = 0;
-    UTop = U;
+    U = UTop;
     while (U->next) {omgCnt++;
         U = U->next;
     }
     U->next = calloc(1, sizeof(UNIT));
     U = U->next;
     U->next = NULL;
-    if(omgCnt == 0) UTop = U;
+    if(omgCnt == 0) U = UTop;
     U->number = registerNum;
     
     for(int i = 0;i < UCN;i++){