From da67dac7fb8c59d33a05761a8fa6e317b20e67dd Mon Sep 17 00:00:00 2001
From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Fri, 1 Jul 2016 04:17:33 +0900
Subject: [PATCH] =?utf8?q?=E3=83=9E=E3=83=83=E3=83=95=E3=82=9A=E6=9B=B8?=
 =?utf8?q?=E3=81=8D=E8=BE=BC=E3=81=BF=E3=81=A6=E3=82=99=E3=81=8D=E3=81=AA?=
 =?utf8?q?=E3=81=84=E8=87=B4=E5=91=BD=E7=9A=84=E3=81=AA=E3=82=A8=E3=83=A9?=
 =?utf8?q?=E3=83=BC=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Awars III/MapEditor.h           | 1 +
 Awars III/MapEditor.m           | 6 ++++--
 Awars III/Title.h               | 1 +
 Awars III/Title.m               | 1 +
 Awars III/en.lproj/MainMenu.xib | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Awars III/MapEditor.h b/Awars III/MapEditor.h
index fdac11f..4399cb8 100644
--- a/Awars III/MapEditor.h	
+++ b/Awars III/MapEditor.h	
@@ -1190,6 +1190,7 @@ NSTimer *timeMapEditor;
 
 -(void)saveMapTFset;
 -(void)initFileDirectoryOthers;
+-(void)initEventGuildList;
 @end
 MapEditor *mapEditor;
 
diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index ae88332..fc3d567 100755
--- a/Awars III/MapEditor.m	
+++ b/Awars III/MapEditor.m	
@@ -186,6 +186,7 @@
     eventGuildListMA = [NSMutableArray new];
 
     [self initFileDirectoryOthers];
+    [self initEventGuildList];
 }
 
 -(id)init{
@@ -1911,6 +1912,7 @@
 
 -(IBAction)loadMap:(id)sender{
     [self initLoadMapList];
+    [self initEventGuildList];
     [loadMapWindow makeKeyAndOrderFront:nil];
     loadMapChipFlag = true;
 }
@@ -8818,7 +8820,7 @@
 
 -(void)setEventGuildList{
     
-    if([eventGuildBC1 state] != 0){
+    if([eventGuildBC1 state] != 0 && [eventGuildListMA count] > 0){
     for(int i = 0;i < UCN;i++){
         
         MF[MFselectedRow+1].MS.guildListRegist[i] = [[eventGuildListMA[i] valueForKey:@"chk"] intValue];
@@ -8828,7 +8830,7 @@
     
     MF[MFselectedRow+1].MS.guildListRegistNum11 = [eventGuildTF1 intValue];
     MF[MFselectedRow+1].MS.guildListRegistNum12 = [eventGuildTF2 intValue];
-    }else if([eventGuildBC2 state] != 0){
+    }else if([eventGuildBC2 state] != 0 && [eventGuildListMA count] > 0){
         for(int i = 0;i < UCN;i++){
             
             MF[MFselectedRow+1].MS.guildListRegist2[i] = [[eventGuildListMA[i] valueForKey:@"chk"] intValue];
diff --git a/Awars III/Title.h b/Awars III/Title.h
index 4046f2e..f4bb59f 100755
--- a/Awars III/Title.h	
+++ b/Awars III/Title.h	
@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "ScenarioList.h"
 #import "SaveDataList.h"
+#import "MapEditor.h"
 bool galleryClickedFlag;
 bool startClickedFlag;
 
diff --git a/Awars III/Title.m b/Awars III/Title.m
index ded9408..880f04e 100755
--- a/Awars III/Title.m	
+++ b/Awars III/Title.m	
@@ -69,6 +69,7 @@
     windowPoint.x = [TitleWindow frame].origin.x;
     windowPoint.y = [TitleWindow frame].origin.y;
     [MapEditorWindow setFrameOrigin:windowPoint];
+    [mapEditor initEventGuildList];
     [TitleWindow close];
 }
 -(IBAction)ScenarioEditor:(id)sender{
diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 4b55917..c3ab6ef 100755
--- a/Awars III/en.lproj/MainMenu.xib	
+++ b/Awars III/en.lproj/MainMenu.xib	
@@ -9016,7 +9016,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