攻撃追加でクラッシュするのを改善

diff --git a/Awars III/UnitChipList.m b/Awars III/UnitChipList.m
index ef8e16e..4ae8a29 100644 (file)
--- a/Awars III/UnitChipList.m
+++ b/Awars III/UnitChipList.m
@@ -3366,10 +3366,18 @@ bool eHandLFlag = false;
             
             while (ani) {
                 
-                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->name]] stringByAppendingString:@","];
+                if(!ani->name)
+                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"(null)"]] stringByAppendingString:@","];
+                else{
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->name]] stringByAppendingString:@","];
+                }
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", ani->ax]] stringByAppendingString:@","];
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", ani->ay]] stringByAppendingString:@","];
-                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->names]] stringByAppendingString:@"\n"];
+                if(!ani->names)
+                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"(null)"]] stringByAppendingString:@"\n"];
+                else{
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->names]] stringByAppendingString:@"\n"];
+                }
                 
                 ani = ani->next;
             }
@@ -3491,10 +3499,18 @@ bool eHandLFlag = false;
             
             while (ani) {
                 
-                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->name]] stringByAppendingString:@","];
+                if(ani->name)
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->name]] stringByAppendingString:@","];
+                else{
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"(null)"]] stringByAppendingString:@","];
+                }
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", ani->ax]] stringByAppendingString:@","];
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", ani->ay]] stringByAppendingString:@","];
-                fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->names]] stringByAppendingString:@"\n"];
+                if(ani->names)
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", ani->names]] stringByAppendingString:@"\n"];
+                else{
+                    fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"(null)"]] stringByAppendingString:@"\n"];
+                }
                 
                 ani = ani->next;
             }
@@ -4061,7 +4077,7 @@ bool eHandLFlag = false;
         
         DAMAGE *Dtop = UC[i].A->D;
         DMGEXTEND *Etop = UC[i].A->E;
-        ANI *ani = UC[i].A->AN.ANI;
+        ANI *ani = NULL;
         ANI *aniTop = ani;
         static bool omfgFlag;
             
@@ -4239,7 +4255,9 @@ bool eHandLFlag = false;
             else UC[i].A->next = NULL;
         }
         
-        if(UC[i].attackListNum <= 0) Atop = NULL;
+        if(UC[i].attackListNum <= 0) {
+            Atop = NULL;
+        }
         UC[i].A = Atop;
     }
     
@@ -4383,7 +4401,7 @@ bool eHandLFlag = false;
             
             DAMAGE *Dtop = LC[i].A->D;
             DMGEXTEND *Etop = LC[i].A->E;
-            ANI *ani = LC[i].A->AN.ANI;
+            ANI *ani = NULL;
             ANI *aniTop = ani;
             static bool omfgFlag;
             
@@ -6116,6 +6134,7 @@ bool eHandLFlag = false;
     A->D = NULL;
     A->E = NULL;
     A->AN.movName = [@"" retain];
+    A->AN.ANI = NULL;
     return A;
 }