致命的バグ修正

diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index f8ebdf9..79f44fc 100755 (executable)
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -1009,6 +1009,8 @@
     }
     */
         
+        if(!MS.D) return;
+        
     if([EDswitch1Btn state] != 0){
         MS.D->switch1f = true;
     }else{
@@ -1029,6 +1031,8 @@
         
         MS.D = msdtop;
         
+        if(!MS.D) return;
+        
         MAPSCRIPT0 *MSDPt = MS.D->P;
         
         MAPSCRIPT0 *MS0 = MS.D->P;
@@ -1373,7 +1377,6 @@
     for (int i = 0;i < eventListRow-1;i++) {
         MS.D = MS.D->next;
     }
-    msdtop = MS.D;
     
     if([eventListMA count] == 1){
         
@@ -1388,10 +1391,18 @@
         MS.D->type = -1;
         
         msdtop = MS.D;
+        mdTop = MS.D;
+        MSDTOPP = MS.D;
         
         if(!MS.SCRPTname) MS.SCRPTname = [NSMutableArray new];
         [MS.SCRPTname addObject:@"新規イベント"];
         
+        [EDnameTF setStringValue:[MS.SCRPTname objectAtIndex:[eventListTV clickedRow]]];
+        
+        [self initEDlist];
+        [eventDetailWindow makeKeyAndOrderFront:nil];
+        
+        
     }else if([eventListTV clickedRow] >= 0){
 
         if([eventListTV clickedRow] == [eventListMA count]-1){
@@ -1414,30 +1425,46 @@
             //MSDTOP = mdTop;
             if(!MS.SCRPTname) MS.SCRPTname = [NSMutableArray new];
             [MS.SCRPTname addObject:@"新規イベント"];
+            
+            
+            [EDnameTF setStringValue:[MS.SCRPTname objectAtIndex:[eventListTV clickedRow]]];
+            
+            [self initEDlist];
+            [eventDetailWindow makeKeyAndOrderFront:nil];
         }else if([eventListTV clickedRow] == 0){
             
             if(MS.D){
-                MS.D->type = -1;
+                MS.D = MS.D;
                 msdtop = MS.D;
             }
-        }else{
+            
+            [EDnameTF setStringValue:[MS.SCRPTname objectAtIndex:[eventListTV clickedRow]]];
+            
+            [self initEDlist];
+            [eventDetailWindow makeKeyAndOrderFront:nil];
+        }else if([eventListTV clickedRow] > 0){
+            
             if(MS.D->next){
                 MS.D = MS.D->next;
-                MS.D->type = -1;
                 msdtop = MS.D;
             }
-        
+            
+            [EDnameTF setStringValue:[MS.SCRPTname objectAtIndex:[eventListTV clickedRow]]];
+            
+            [self initEDlist];
+            [eventDetailWindow makeKeyAndOrderFront:nil];
         }
         
-        
         [EDnameTF setStringValue:[MS.SCRPTname objectAtIndex:[eventListTV clickedRow]]];
         
         [self initEDlist];
         [eventDetailWindow makeKeyAndOrderFront:nil];
     }
     MS.D = mdTop;
+    
     MF[MFselectedRow+1].MS.D = MS.D;
-    MF[MFselectedRow+1].MS.D = MSDTOPP;
+    MF[MFselectedRow+1].MS = MS;
+    MF[MFselectedRow+1].MS.D = msdtop;
     
     EDproceedFlag = true;
 }
@@ -2419,6 +2446,8 @@
     
     MF[MFselectedRow+1].MS.D = MSDTOPP;
     
+    //[self initEventList];
+    
     EDproceedFlag = false;
     [eventDetailWindow close];
 }