From 430c26f05fb21ce63d80cf2be302da06b0d9b452 Mon Sep 17 00:00:00 2001
From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Wed, 3 Aug 2016 15:40:52 +0900
Subject: [PATCH] =?utf8?q?=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Awars III/FieldView.m           |  8 +++++---
 Awars III/MapEditor.m           |  2 ++
 Awars III/ScenarioList.m        | 37 +++++++++++++++++++------------------
 Awars III/en.lproj/MainMenu.xib |  2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index ba07230..7d60b03 100755
--- a/Awars III/FieldView.m	
+++ b/Awars III/FieldView.m	
@@ -307,12 +307,14 @@
     
     if(bclRdy){
         U = UTop;
-        int i = 1;
-        while(U && AUN[1] > i){i++;
+        
+        while(U->number != AUN[1]){
             U = U->next;
         }
+       
         
-        buildNum[possionX][possionY] = U->C.S->list[crBCL]-1;
+        if(U)
+            buildNum[possionX][possionY] = U->C.S->list[crBCL]-1;
         
         U = UTop;
         bclRdy = false;
diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index 8d7b33f..24d7753 100755
--- a/Awars III/MapEditor.m	
+++ b/Awars III/MapEditor.m	
@@ -8849,6 +8849,8 @@
                 if(i == 5 && j == 5  && k == 20){
                     NSLog(@"いまだー");
                 }
+                
+                if([SC[i].nameMAP count] > 0)
                 if([MF[k+1].fileName isEqualToString:SC[i].nameMAP[j]]){
                     MFselectedRow = k;
                     
diff --git a/Awars III/ScenarioList.m b/Awars III/ScenarioList.m
index 68571c0..a9631ba 100755
--- a/Awars III/ScenarioList.m	
+++ b/Awars III/ScenarioList.m	
@@ -10,29 +10,28 @@
 
 @implementation ScenarioList
 -(IBAction)startButton:(id)sender{
-    if([scenarioListTV selectedRow] < 0) return;
     
-    scenarioNumb = (int)[scenarioListTV selectedRow];
-    storyNumb = (int)[PUBscenario indexOfSelectedItem] + 1;
+    if([scenarioListTV selectedRow] < 0) return;
     
     startES = true;
     [stringText InitStringList];
-    /*
-    int k = 0;
-    for(int j = 0;j < [SC[storyNumb].sName count];j++){
-        for (int i = 0;i < [scenarioListMA count];i++) {
-            if([[scenarioListMA[scenarioNumb] valueForKey:@"name"] isEqualToString:SC[storyNumb].sName[j]]){
-                goto zOMG;
-                
-            }
-        }
-        k++;
-    }
-    
-    zOMG:
     
-    scenarioNumb = k;
-    */
+    /*
+     int k = 0;
+     for(int j = 0;j < [SC[storyNumb].sName count];j++){
+     for (int i = 0;i < [scenarioListMA count];i++) {
+     if([[scenarioListMA[scenarioNumb] valueForKey:@"name"] isEqualToString:SC[storyNumb].sName[j]]){
+     goto zOMG;
+     
+     }
+     }
+     k++;
+     }
+     
+     zOMG:
+     
+     scenarioNumb = k;
+     */
     MFselectedRow = scenarioNumb + 1;
     [SLPanel close];
     [NSApp stopModal];
@@ -373,6 +372,8 @@
             }
         }
     }
+    
+    [scenarioListAC setSelectionIndex:9999];
 
 }
 
diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index dc88c3e..4be6438 100755
--- a/Awars III/en.lproj/MainMenu.xib	
+++ b/Awars III/en.lproj/MainMenu.xib	
@@ -9065,7 +9065,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>
-- 
2.11.0