重大なバグを発見、修正

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 4476f5b..0b8699c 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -9599,7 +9599,7 @@ SKIP1:
                 if(!MS0->S4.subj && !MS0->S4.obje){
                 
                 if(MS0->S4.unitCMD == 0){
-                    if(unitMoveEndFlag){
+                    if(pushStanbyFlag){
                         
                     }else{
                         trueFlag = false;
@@ -9623,7 +9623,7 @@ SKIP1:
                     if(Uselected->ix == MS0->S4.subj->x && Uselected->iy == MS0->S4.subj->y && Uselected->iz == 1){
                     
                     if(MS0->S4.unitCMD == 0){
-                        if(unitMoveEndFlag){
+                        if(pushStanbyFlag){
                             
                         }else{
                             trueFlag = false;
@@ -9652,7 +9652,7 @@ SKIP1:
                        Utarget->ix == MS0->S4.obje->x && Utarget->iy == MS0->S4.obje->y && Utarget->iz == 1){
                     
                     if(MS0->S4.unitCMD == 0){
-                        if(unitMoveEndFlag){
+                        if(pushStanbyFlag){
                             
                         }else{
                             trueFlag = false;
@@ -9681,7 +9681,7 @@ SKIP1:
                        BC[buildNum[Uselected->x][Uselected->y]].nameID == MS0->S4.build->C->nameID){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9707,7 +9707,7 @@ SKIP1:
                 if(!MS0->S4.subj && !MS0->S4.obje){
                     
                     if(MS0->S4.unitCMD == 0){
-                        if(unitMoveEndFlag){
+                        if(pushStanbyFlag){
                             
                         }else{
                             trueFlag = false;
@@ -9731,7 +9731,7 @@ SKIP1:
                     if(Uselected->ix == MS0->S4.subj->x && Uselected->iy == MS0->S4.subj->y && Uselected->iz == 1){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9760,7 +9760,7 @@ SKIP1:
                        Utarget->ix == MS0->S4.obje->x && Utarget->iy == MS0->S4.obje->y && Utarget->iz == 1){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9789,7 +9789,7 @@ SKIP1:
                        BC[buildNum[Uselected->x][Uselected->y]].nameID == MS0->S4.build->C->nameID){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9814,7 +9814,7 @@ SKIP1:
                 if(!MS0->S4.subj && !MS0->S4.obje){
                     
                     if(MS0->S4.unitCMD == 0){
-                        if(unitMoveEndFlag){
+                        if(pushStanbyFlag){
                             
                         }else{
                             trueFlag = false;
@@ -9835,7 +9835,7 @@ SKIP1:
                     if(Uselected->ix == MS0->S4.subj->x && Uselected->iy == MS0->S4.subj->y && Uselected->iz == 1){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9861,7 +9861,7 @@ SKIP1:
                        Utarget->ix == MS0->S4.obje->x && Utarget->iy == MS0->S4.obje->y && Utarget->iz == 1){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;
@@ -9886,7 +9886,7 @@ SKIP1:
                        BC[buildNum[Uselected->x][Uselected->y]].nameID == MS0->S4.build->C->nameID){
                         
                         if(MS0->S4.unitCMD == 0){
-                            if(unitMoveEndFlag){
+                            if(pushStanbyFlag){
                                 
                             }else{
                                 trueFlag = false;

diff --git a/Awars III/LevelList.m b/Awars III/LevelList.m
index 0931836..a086ad5 100644 (file)
--- a/Awars III/LevelList.m
+++ b/Awars III/LevelList.m
@@ -45,7 +45,7 @@
     
     if([levelListMA1 count] > 0 && LL1row >=0){
         SC[LL1row+1].name = [[[levelListMA1 objectAtIndex:LL1row] valueForKey:@"name"] retain];
-        SC[LL1row+1].img = [[[levelListMA1 objectAtIndex:LL1row] valueForKey:@"img"] retain];
+        SC[LL1row+1].iName = [[[levelListMA1 objectAtIndex:LL1row] valueForKey:@"img"] retain];
     }
     
     if([levelListMA2 count] >0 && LL2row >= 0){

diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index 3ac7ae4..0c060df 100755 (executable)
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -1315,11 +1315,8 @@
         
     }
     
-    MS.D = MSDTOPP;
+    MS.D = MSDtop;
     for (int i = 0;i < eventListRow;i++) {
-        if(!MS.D->next){
-            MS.D->next = calloc(1, sizeof(MAPSCRIPTD));
-        }
         MS.D = MS.D->next;
     }
     msdtop = MS.D;
@@ -1348,7 +1345,7 @@
     [self didChangeValueForKey:@"eventPosMA"];
     }
     
-    MS.D = MSDTOPP;
+    MS.D = MSDTOP;
     
 }
 -(void)doubleClickEL:(id)sender{
@@ -1359,7 +1356,7 @@
     for (int i = 0;i < eventListRow;i++) {
         MS.D = MS.D->next;
     }
-    msdtop = MS.D;
+    //msdtop = MS.D;
     
     if([eventListTV clickedRow] >= 0){
 
@@ -1375,14 +1372,14 @@
             if(!MS.D){
                 MS.D = calloc(1, sizeof(MAPSCRIPTD));
                 mdTop = MS.D;
-                msdtop = MS.D;
+                //msdtop = MS.D;
                 MS.D->type = -1;
                 if(!mapLoadFlagForMSD2 && mapLoadFlagForMSD){
                     MSDTOPP->next = MS.D;
                     mapLoadFlagForMSD2 = true;
                 }
                 if(!mapLoadFlagForMSD){
-                    MSDTOPP = MS.D;
+                    MSDTOPP = msdtop;
                     mapLoadFlagForMSD = true;
                 }
             }
@@ -1499,14 +1496,7 @@
             }
             
             if([[MS.D->SCRPT objectAtIndex:EDrow] isEqualToString:@"◆文章の表示"]){
-                MSDTOP = MF[MFselectedRow+1].MS.D;
-                
-                for (int i = 0;i < eventListRow;i++) {
-                    MF[MFselectedRow+1].MS.D = MF[MFselectedRow+1].MS.D->next;
-                }
-                
-                MF[MFselectedRow+1].MS.D = MSDTOP;
-                
+
                 [self initEDtext];
                 [EDtextWindow makeKeyAndOrderFront:nil];
             }
@@ -2074,7 +2064,7 @@
         for (int i = 0;i < eventListRow;i++) {
             MF[MFselectedRow+1].MS.D = MF[MFselectedRow+1].MS.D->next;
         }
-        msdtop = MF[MFselectedRow+1].MS.D;
+        //msdtop = MF[MFselectedRow+1].MS.D;
         
         MF[MFselectedRow+1].MS.D = MSDTOP;
         [self initEDlist];
@@ -2384,7 +2374,7 @@
     MAPSCRIPT MS = MF[MFselectedRow+1].MS;
     MS.D = msdtop;
     
-    
+    if(!MS.D) return;
     [MS.SCRPTname replaceObjectAtIndex:[eventListAC selectionIndex] withObject:[EDnameTF stringValue]];
     
     
@@ -2434,6 +2424,8 @@
     [self didChangeValueForKey:@"eventDetailListMA"];
     [eventDetailListAC setSelectionIndex:9999];
     
+    if(!MS.D) return;
+    
     if(MS.D)
     if(!MS.D->SCRPT){
         MS.D->SCRPT = [NSMutableArray new];
@@ -2445,7 +2437,7 @@
         [self willChangeValueForKey:@"EDswitch2MA"];
         [EDswitch2MA removeAllObjects];
         [self didChangeValueForKey:@"EDswitch2MA"];
-    
+    if(MS.D)
     if(MS.D->switch1)
     for(int i = 0; *(MS.D->switch1+i) > 0;i++){
         NSMutableDictionary* dict = [NSMutableDictionary new];
@@ -2458,7 +2450,7 @@
         
     
     }
-    
+    if(MS.D)
     if(MS.D->switch2)
     for(int i = 0; *(MS.D->switch2+i) > 0;i++){
         NSMutableDictionary* dict = [NSMutableDictionary new];
@@ -2473,7 +2465,7 @@
     }
     //MS.D->type = -1;
     
-    
+    if(MS.D){
     if(MS.D->switch1f)
         [EDswitch1Btn setState:YES];
     else
@@ -2483,7 +2475,7 @@
         [EDswitch2Btn setState:YES];
     else
         [EDswitch2Btn setState:NO];
-    
+    }
     [EDeventTimeTF1 setStringValue:[NSString stringWithFormat:@"%g", MS.D->ET1]];
     [EDeventTimeTF2 setStringValue:[NSString stringWithFormat:@"%g", MS.D->ET2]];
     [EDeventTrigger selectItemAtIndex:MS.D->ETtype];

diff --git a/Awars III/MapView.m b/Awars III/MapView.m
index c86e1a8..cadf753 100644 (file)
--- a/Awars III/MapView.m
+++ b/Awars III/MapView.m
@@ -647,9 +647,9 @@
         NSArray *array3 = [[fileDataArray objectAtIndex:i] componentsSeparatedByString:@"◆"];
         NSString *string2 = [NSString stringWithFormat:@"%@◆", [array3 objectAtIndex:0]];
         NSRange rangeSearch2 = [[fileDataArray objectAtIndex:i] rangeOfString:string2];
-        int pussyCnt = 0;
-        int mankoCnt = 0;
-        int analCnt = 0;
+        static int pussyCnt = 0;
+        static int mankoCnt = 0;
+        static int analCnt = 0;
         
         if (rangeSearch.location == !NSNotFound) {
             
@@ -670,7 +670,7 @@
             }
             if(!MS.D){
 
-            }else {
+            }else{
                 if(!MS.D->P){
                     MS.D->P = MSDPtop;
                 }
@@ -738,6 +738,13 @@
         if (rangeSearch2.location == !NSNotFound) {
            pussyCnt = 0;
             
+            if(MS.D){
+                if(MS.D->P) MS.D->P->S2 = MS2T;
+                if(MS.D->P) MS.D->P->S4.subj = sjt;
+                if(MS.D->P) MS.D->P->S4.wayp = wpt;
+                if(MS.D->P) MS.D->P->S4.obje = ojt;
+                if(MS.D->P) MS.D->P->S4.build = bdt;
+            }
             MS2T = NULL;
             sjt = NULL;
             wpt = NULL;
@@ -1126,10 +1133,13 @@
                                             NSString *string = @"";
                                             string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain];
                                     if([string isEqualToString:@""]) continue;
+                                        if(pussyCnt > 0)
+                                            MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain];
                                             MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingString:string] retain];
-                                    if(pussyCnt > 0) MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain];
+                                    
                                     if(![string isEqualToString:@""])
-                                            [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];pussyCnt++;
+                                            [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];
+                                        pussyCnt++;
                                 }
                                 }if(MS.D->P->type == 1){
                                     
@@ -1378,8 +1388,8 @@
                                     NSString *string = @"";
                                     string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain];
                                     if([string isEqualToString:@""]) continue;
-                                    MS.D->P->memo = [[MS.D->P->memo stringByAppendingString:string] retain];
                                     if(pussyCnt > 0) MS.D->P->memo = [[MS.D->P->memo stringByAppendingFormat:@"\n"] retain];
+                                    MS.D->P->memo = [[MS.D->P->memo stringByAppendingString:string] retain];
                                     if(![string isEqualToString:@""])
                                         [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];
                                     pussyCnt++;
@@ -1473,11 +1483,6 @@
             
             if([array100 count] > 2 || [array101 count] > 2)
             if(rangeSearch100.location != NSNotFound || rangeSearch101.location != NSNotFound){
-                if(MS.D->P) MS.D->P->S2 = MS2T;
-                if(MS.D->P) MS.D->P->S4.subj = sjt;
-                if(MS.D->P) MS.D->P->S4.wayp = wpt;
-                if(MS.D->P) MS.D->P->S4.obje = ojt;
-                if(MS.D->P) MS.D->P->S4.build = bdt;
             if(MS.D)
                 if(MS.D->P){
                     if(MS.D->P->S3){
@@ -1489,11 +1494,7 @@
                 }
             }
         }else{
-            if(MS.D->P) MS.D->P->S2 = MS2T;
-            if(MS.D->P) MS.D->P->S4.subj = sjt;
-            if(MS.D->P) MS.D->P->S4.wayp = wpt;
-            if(MS.D->P) MS.D->P->S4.obje = ojt;
-            if(MS.D->P) MS.D->P->S4.build = bdt;
+            
         if(MS.D)
             if(MS.D->P){
                 if(MS.D->P->S3){
@@ -1504,9 +1505,10 @@
                 }
             }
         }
+        //NSLog(@"", i, MS);
     }
     
-
+   
     //MS.D->P->S1.str = [MS.D->P->S1.str substringToIndex:MS.D->P->S1.str.length-4];
     if(MS.D) MS.D->P = MSDPtop;
     MS.D = MSDtop;
@@ -1514,6 +1516,7 @@
     MSDTOPP = MSDtop;
     supFlag = false;
     supFlag2 = false;
+    MF[MFselectedRow+1].MS.D = MS.D;
     MF[MFselectedRow+1].MS = MS;
     mapSizeChangedFlag = true;
     mapLoadFlagForMSD = false;
@@ -1526,7 +1529,6 @@
     NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
     [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
 
-
     NSString *fileData = @"";
     NSString *pathDATA = @"Map/";
 
@@ -1688,7 +1690,12 @@
         }
         fileData = [fileData stringByAppendingFormat:@"\n"];
         
-        if(!MS.D->P) break;
+        if(!MS.D->P) {
+            MS.D = MS.D->next;
+            
+            continue;
+        
+        }
         
         while(MS.D->P){
             if(MS.D->P->type == 0){