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

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index d841224..7da2713 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -69,7 +69,6 @@
     if(startOrEndFlag){
         if(!seFlag){
             stringInitFlag = true;
-            StringText *stringText = [[StringText alloc] init];
             [stringText InitStringList];
             stringInitFlag = false;
             seFlag = true;
@@ -341,6 +340,8 @@
         textMax = (int)[ST->string length];
         text = ST->string;
         tName = ST->name;
+        if(!tName)
+            tName = [@" " retain];
         [nameTF setStringValue:tName];
         [dialogTF setStringValue:[text substringToIndex:dialogLengh - 1]];
         [faceIV setImage:ST->img];

diff --git a/Awars III/ScenarioEditor.m b/Awars III/ScenarioEditor.m
index 9d8db29..ca38173 100755 (executable)
--- a/Awars III/ScenarioEditor.m
+++ b/Awars III/ScenarioEditor.m
@@ -89,6 +89,7 @@
         textListMA = [NSMutableArray new];
         lineListMA = [NSMutableArray new];
         
+        
         StringText *stringText = [[StringText alloc] init];
         
         for(int i = 0;i<255;i++){
@@ -886,6 +887,29 @@
 
 -(void)EventLoop2:(NSTimer *)timer{
     
+    
+    TX[st].S = STRtop[st];
+    
+    if (st >= 0) {
+        if(TX[st].S != NULL){
+            for(int k = 0;k < LLrow ;k++) {
+                TX[st].S = TX[st].S->next;
+            }
+            
+            TX[st].S->name = [[Dname stringValue] retain];
+            TX[st].S->string = [[Dstring stringValue] retain];
+            
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
+            [lineListAC setValue:[NSString stringWithFormat:@"%@：%@", TX[st].S->name, TX[st].S->string] forKeyPath:@"selection.name"];
+            
+        }
+    }
+    
+    TX[st].S = STRtop[st];
+    
     if(SEstandImgST)
         [SESTIV setImage:SEstandImgST];
     
@@ -1380,7 +1404,7 @@
         NSArray *rangeArray3;
         bool commentSwitch = false;
         rangeSearch = [str rangeOfString:@"##"];
-        rangeSearch2 = [str rangeOfString:@"####"];
+        rangeSearch2 = [str rangeOfString:@"#####"];
         rangeSearch3 = [str rangeOfString:@"##" options:NSBackwardsSearch];
         rangeArray = [str componentsSeparatedByString:@"##"];
         rangeArray2 = [str componentsSeparatedByString:@"%%"];
@@ -1407,7 +1431,11 @@
             siCnt = 0;
             TX[i].S = TX[i].S->next;
             TX[i].S->name = [[str substringWithRange:range] retain];
-            TX[i].S->name = [[rangeArray objectAtIndex:1] retain];
+            if([rangeArray objectAtIndex:1] != nil){
+                TX[i].S->name = [[rangeArray objectAtIndex:1] retain];
+            }else{
+                TX[i].S->name = [@"" retain];
+            }
             TX[i].S->string = @"";
             if(rangeSearch3.location != NSNotFound && [rangeArray count] > 2){
                 

diff --git a/Awars III/StringText.h b/Awars III/StringText.h
index c91b7d8..2e8e601 100755 (executable)
--- a/Awars III/StringText.h
+++ b/Awars III/StringText.h
@@ -122,6 +122,7 @@ bool mouseHolding;
 
 -(void)InitStringList;
 @end
+StringText *stringText;
 
 
 

diff --git a/Awars III/StringText.m b/Awars III/StringText.m
index 02b2bd2..3be4ad3 100644 (file)
--- a/Awars III/StringText.m
+++ b/Awars III/StringText.m
@@ -27,6 +27,7 @@
                  ];
         [self AddString:&ST :0];
         //[self InitStringList];
+        stringText = self;
         dialogLengh = 1;
         dialogNumber = 1;
         
@@ -218,8 +219,9 @@
         NSArray *rangeArray7;
         bool commentSwitch = false;
         rangeSearch = [str rangeOfString:@"##"];
-        rangeSearch2 = [str rangeOfString:@"####"];
+        rangeSearch2 = [str rangeOfString:@"#####"];
         rangeSearch3 = [str rangeOfString:@"##" options:NSBackwardsSearch];
+        rangeSearch4 = [str rangeOfString:@"####"];
         rangeArray = [str componentsSeparatedByString:@"##"];
         rangeArray2 = [str componentsSeparatedByString:@"%%"];
         rangeSearch4 = [str rangeOfString:@"%%"];
@@ -239,7 +241,7 @@
         
         if (rangeSearch2.location != NSNotFound) {commentSwitch = true;
           
-        }else if (rangeSearch.location != NSNotFound) {commentSwitch = false;
+        }else if (rangeSearch.location != NSNotFound || rangeSearch4.location != NSNotFound) {commentSwitch = false;
             
             if(STItop) ST->i = STItop;
             STItop = NULL;
@@ -256,9 +258,11 @@
             ST->next->standPossition =ST->standPossition;
             ST->next->N = ST->N;
             ST = ST->next;
-            ST->name = [[str substringWithRange:range] retain];
-            ST->name = [[rangeArray objectAtIndex:1] retain];
-            ST->string = @"";
+            if([rangeArray objectAtIndex:1] != nil)
+                ST->name = [[rangeArray objectAtIndex:1] retain];
+            else
+                ST->name =[@"" retain];
+            ST->string = [@"" retain];
             dialogMax++;
             if(rangeSearch3.location != NSNotFound && [rangeArray count] > 2){