またまたバグ発見、修正

diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index 0c060df..9e436d6 100755 (executable)
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -989,11 +989,13 @@
     if(EDproceedFlag){
     
     MAPSCRIPT MS = MF[MFselectedRow+1].MS;
-    MS.D = MSDTOPP;
-    for(int i = 0;i < eventListRow;i++){
+    MS.D = MSDTOP;
+    /*
+        for(int i = 0;i < eventListRow;i++){
         MS.D = MS.D->next;
     }
-    
+    */
+        
     if([EDswitch1Btn state] != 0){
         MS.D->switch1f = true;
     }else{
@@ -1005,7 +1007,6 @@
     }else{
         MS.D->switch2f = false;
     }
-    MS.D = MSDTOPP;
         
     }
     
@@ -1352,11 +1353,12 @@
     
     MAPSCRIPT MS = MF[MFselectedRow+1].MS;
     MAPSCRIPTD *mdTop = MS.D;
-
-    for (int i = 0;i < eventListRow;i++) {
+    
+    
+    for (int i = 0;i < eventListRow-1;i++) {
         MS.D = MS.D->next;
     }
-    //msdtop = MS.D;
+    msdtop = MS.D;
     
     if([eventListTV clickedRow] >= 0){
 
@@ -1369,33 +1371,45 @@
             [self didChangeValueForKey:@"eventListMA"];
             [eventListAC setSelectionIndex:[eventListMA count]-2];
             
-            if(!MS.D){
+            if(!mdTop){
                 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 = msdtop;
+                    MSDTOPP = mdTop;
                     mapLoadFlagForMSD = true;
                 }
-            }
-            else{
-                while (MS.D->next)
-                    MS.D = MS.D->next;
+                MSDTOP = MS.D;
+            }else if(!MS.D->next){
+                MS.D->next = calloc(1, sizeof(MAPSCRIPTD));
                 
-                MS.D->type = -1;
-                MS.D->next = NULL;
-                //msdtop = MS.D->next;
+                MS.D->next->type = -1;
+                MS.D->next->next = NULL;
+                msdtop = MS.D->next;
             }
             
             MS.D = mdTop;
-            
+            MSDTOP = MS.D;
             if(!MS.SCRPTname) MS.SCRPTname = [NSMutableArray new];
             [MS.SCRPTname addObject:@"新規イベント"];
+        }else if([eventListTV clickedRow] == 0){
+            
+            if(MS.D){
+                MS.D->type = -1;
+                msdtop = MS.D;
+            }
+        }else{
+            if(MS.D->next){
+                MS.D = MS.D->next;
+                MS.D->type = -1;
+                msdtop = MS.D;
+            }
+        
         }
         
         
@@ -1429,6 +1443,7 @@
     EDrow = [eventDetailListTV clickedRow];
     
     MAPSCRIPT MS = MF[MFselectedRow+1].MS;
+    MAPSCRIPTD *msd = MF[MFselectedRow+1].MS.D;
     
     MS.D = msdtop;
     
@@ -1588,9 +1603,11 @@
         
     }
     
-    MF[MFselectedRow+1].MS.D = MS.D;
+    msdtop = MS.D;
     
     
+    MF[MFselectedRow+1].MS.D = MS.D;
+    MF[MFselectedRow+1].MS.D = MSDTOPP;
     
    // NSLog(@"oops");
 }
@@ -2006,7 +2023,7 @@
 -(IBAction)eventInsert:(id)sender{
 
     MAPSCRIPT MS = MF[MFselectedRow+1].MS;
-    MSDTOPP = MF[MFselectedRow+1].MS.D;
+    //MSDTOPP = MF[MFselectedRow+1].MS.D;
     NSInteger sel = [eventListAC selectionIndex];
     
     if(sel < [eventListMA count]){