シナリオエディタバグ修正

diff --git a/Awars III/ScenarioEditor.m b/Awars III/ScenarioEditor.m
index ca38173..ad3526c 100755 (executable)
--- a/Awars III/ScenarioEditor.m
+++ b/Awars III/ScenarioEditor.m
@@ -1803,16 +1803,7 @@
                 fileData = [fileData stringByAppendingString:[NSString stringWithFormat:@"%@",TX[st].S->iNameWallSort]];
             }
             fileData = [fileData stringByAppendingString:[NSString stringWithFormat:@"\n"]];
-            if(TX[st].S->img){
-                NSString *path = @"data/StringList/img/";
-                NSData *data = [TX[st].S->img TIFFRepresentation];
-                NSBitmapImageRep *brep = [NSBitmapImageRep imageRepWithData:data];
-                data = [brep representationUsingType:NSPNGFileType properties:nil];
-                
-                path = [path stringByAppendingString:TX[st].S->iName];
-                
-                [data writeToFile:path atomically:YES];
-            }if(TX[st].S->imgWall){
+            if(TX[st].S->imgWall && TX[st].S->iNameWall){
                 NSString *path = @"data/StringList/img/";
                 NSData *data = [TX[st].S->imgWall TIFFRepresentation];
                 NSBitmapImageRep *brep = [NSBitmapImageRep imageRepWithData:data];
@@ -1825,6 +1816,17 @@
 
         }
         
+        if(TX[st].S->img && TX[st].S->iName){
+            NSString *path = @"data/StringList/img/";
+            NSData *data = [TX[st].S->img TIFFRepresentation];
+            NSBitmapImageRep *brep = [NSBitmapImageRep imageRepWithData:data];
+            data = [brep representationUsingType:NSPNGFileType properties:nil];
+            
+            path = [path stringByAppendingString:TX[st].S->iName];
+            
+            [data writeToFile:path atomically:YES];
+        }
+        
         TX[st].S = TX[st].S->next;
     }while(TX[st].S != NULL);
     
@@ -1836,7 +1838,8 @@
 
 -(IBAction)saveLineData:(id)sender{
     
-                    
+    TX[st].fileName = [textListMA[st] valueForKey:@"name"];
+    
     [self saveLineDataFnc];
 }
 
@@ -2631,34 +2634,35 @@
 
 -(IBAction)detailClose:(id)sender{
 
+    TX[st].fileName = [textListMA[st] valueForKey:@"name"];
+    
     TX[st].S = STRtop[st];
     for(int i = 0;i < sl;i++){
         TX[st].S = TX[st].S->next;
     }
     
-    SItop = TX[st].S->i;
-    while(TX[st].S->i){
-    
     TX[st].S->img = [[IVface image] retain];
     TX[st].S->imgWall = [[IVwall image] retain];
+    TX[st].S->wallFadeIn = [FIbtn state];
+    TX[st].S->wallFadeOut = [FObtn state];
+    
+    if([TFface stringValue]) TX[st].S->iName = [[TFface stringValue] retain];
+    if([TFwall stringValue]) TX[st].S->iNameWall = [[TFwall stringValue] retain];
+    
+    SItop = TX[st].S->i;
+    while(TX[st].S->i){
     
     if(SEMA1row < 0 || SEMA2row < 0){
         TX[st].S->i->imgStand = NULL;
     }else{
         //TX[st].S->i->imgStand = [[SEIV image] retain];
     }
-    if([TFface stringValue]) TX[st].S->iName = [[TFface stringValue] retain];
-    if([TFwall stringValue]) TX[st].S->iNameWall = [[TFwall stringValue] retain];
-
     
     NSString *directoryPath;
     
     directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
     [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
-    
-    TX[st].S->wallFadeIn = [FIbtn state];
-    TX[st].S->wallFadeOut = [FObtn state];
-    
+   
     if(SEMA1row < 0){
         TX[st].S->i = SItop;
         TX[st].S = STRtop[st];