シナリオラインバグフィクス

diff --git a/Awars III/EventScene.h b/Awars III/EventScene.h
index f91d73d..95c8ed4 100755 (executable)
--- a/Awars III/EventScene.h
+++ b/Awars III/EventScene.h
@@ -52,6 +52,8 @@ int esSceneProc;
 
 bool saveFileFlag;
 
+bool bahBugFixFlag;
+
 @interface EventScene : NSObject
 {
     NSTimer *timer;

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index 7da2713..15e24c7 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -69,6 +69,7 @@
     if(startOrEndFlag){
         if(!seFlag){
             stringInitFlag = true;
+            bahBugFixFlag = false;
             [stringText InitStringList];
             stringInitFlag = false;
             seFlag = true;
@@ -82,6 +83,7 @@
     if(!ST){
         if(!startOrEndFlag){
             mapInitFlag = true;
+            bahBugFixFlag = false;
             
             [MapViewInst loadMapChip];
             mapInitFlag = false;
@@ -110,6 +112,7 @@
                 return;
             }
             
+            bahBugFixFlag = false;
             seFlag = false;
             startES = false;
             EventViewDraw = true;
@@ -151,9 +154,11 @@
         ST = evSTtop;
     }
     
-    while(dialogNumber > dCount) {dCount++;
-        ST = ST->next;
+    while(dialogNumber > dCount) {
+        if(bahBugFixFlag) ST = ST->next;
+        dCount++;
     }
+    bahBugFixFlag = true;
 
     int textMax;
     NSString *text;

diff --git a/Awars III/ScenarioList.m b/Awars III/ScenarioList.m
index c30e818..2b3cdcf 100755 (executable)
--- a/Awars III/ScenarioList.m
+++ b/Awars III/ScenarioList.m
@@ -16,7 +16,6 @@
     storyNumb = (int)[PUBscenario indexOfSelectedItem] + 1;
     
     startES = true;
-    StringText *stringText = [[StringText alloc] init];
     [stringText InitStringList];
     
     int k = 0;
@@ -79,7 +78,6 @@
     storyNumb = (int)[PUBscenario indexOfSelectedItem] + 1;
     
     startES = true;
-    StringText *stringText = [[StringText alloc] init];
     [stringText InitStringList];
     
     int k = 0;

diff --git a/Awars III/StringText.m b/Awars III/StringText.m
index 3be4ad3..3052f2a 100644 (file)
--- a/Awars III/StringText.m
+++ b/Awars III/StringText.m
@@ -116,6 +116,10 @@
 }
 
 -(void)InitStringList{
+    dialogLengh = 0;
+    dialogNumber = 0;
+    dialogMax = 0;
+    
     
     NSString *directoryPath;
     
@@ -217,11 +221,11 @@
         NSArray *rangeArray6;
         NSRange rangeSearch9;
         NSArray *rangeArray7;
+        NSRange rangeSearch10;
         bool commentSwitch = false;
         rangeSearch = [str rangeOfString:@"##"];
         rangeSearch2 = [str rangeOfString:@"#####"];
         rangeSearch3 = [str rangeOfString:@"##" options:NSBackwardsSearch];
-        rangeSearch4 = [str rangeOfString:@"####"];
         rangeArray = [str componentsSeparatedByString:@"##"];
         rangeArray2 = [str componentsSeparatedByString:@"%%"];
         rangeSearch4 = [str rangeOfString:@"%%"];
@@ -235,21 +239,24 @@
         rangeArray6 = [str componentsSeparatedByString:@"**"];
         rangeSearch9 = [str rangeOfString:@"≠≠"];;
         rangeArray7 = [str componentsSeparatedByString:@"≠≠"];
-        
+        rangeSearch10 = [str rangeOfString:@"####"];
         
         
         
         if (rangeSearch2.location != NSNotFound) {commentSwitch = true;
           
-        }else if (rangeSearch.location != NSNotFound || rangeSearch4.location != NSNotFound) {commentSwitch = false;
+        }else if (rangeSearch.location != NSNotFound || rangeSearch10.location != NSNotFound) {commentSwitch = false;
             
             if(STItop) ST->i = STItop;
             STItop = NULL;
             STIcnt = 0;
+            if(ST)
             if(ST->S)
                 ST->S = SVtop;
-            ST->index++;
-            [self AddString:&ST :ST->index];
+            if(1){
+                ST->index++;
+                [self AddString:&ST :ST->index];
+            }
             ST->next->iNameWall =ST->iNameWall;
             ST->next->imgWall = [ST->imgWall retain];
             ST->next->wallFadeOut = ST->wallFadeOut;

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 47427b9..f840589 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -2346,7 +2346,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="1720">
-                            <rect key="frame" x="465" y="1" width="16" height="480"/>
+                            <rect key="frame" x="466" y="1" width="15" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
@@ -8994,7 +8994,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
-                            <rect key="frame" x="465" y="1" width="16" height="480"/>
+                            <rect key="frame" x="466" y="1" width="15" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>