From c82c817b1c399d422211aeba27821efece3e5683 Mon Sep 17 00:00:00 2001
From: Killery <Killery@kiritani-no-mac-mini.local>
Date: Sun, 17 Apr 2016 19:42:58 +0900
Subject: [PATCH] =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=81=B8?=
 =?utf8?q?=E6=88=BB=E3=82=8B=E3=83=9B=E3=82=99=E3=82=BF=E3=83=B3=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Awars III/FieldScene.h          |   6 +-
 Awars III/FieldScene.m          | 124 ++++++++++++++++++++++++++++++----------
 Awars III/FieldView.h           |  13 +++++
 Awars III/FieldView.m           |  43 ++++++++++++++
 Awars III/en.lproj/MainMenu.xib |  40 +++++++++++++
 5 files changed, 193 insertions(+), 33 deletions(-)

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index bc4453c..826fe5a 100755
--- a/Awars III/FieldScene.h	
+++ b/Awars III/FieldScene.h	
@@ -549,6 +549,7 @@ int mapChipDataLoadProc;
     IBOutlet NSArrayController *STskillListAC;
     IBOutlet NSTableView *STskillListTV;
     
+    IBOutlet NSPanel *FSMenu;
 }
 -(MAPSCRIPT0*)setMessage:(MAPSCRIPT0*)MS0;
 
@@ -605,12 +606,13 @@ int mapChipDataLoadProc;
 
 
 
-
+-(IBAction)FSVtitle:(id)sender;
+-(IBAction)FSVcancel:(id)sender;
 
 
 -(int)chooseGuildList:(int*)value gcnum:(int)gcnum;
 -(void)addBuildStatus;
-
+-(void)displaySideMenu;
 @end
 
 FieldScene *fieldScene;
diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 7db2028..940a882 100755
--- a/Awars III/FieldScene.m	
+++ b/Awars III/FieldScene.m	
@@ -1487,6 +1487,14 @@
     }
     
     if (initMapFlag && !initStatusFlag) {
+        registerNum = 0;
+        registerNumB = 0;
+        wtRdy = false;
+        wtRdy2 = false;
+        wtRdy3 = false;
+        
+        
+        
         [self initUnitStatus];
         [self initBuildStatus];
         
@@ -1531,6 +1539,37 @@
         mapChipDataLoadProc = 0;
     }
     
+    if(mapChipDataLoadFail){
+        [endGamePanel close];
+        
+        endGameCondition = false;
+        initMapFlag = false;
+        TeamCountFlag = false;
+        initStatusFlag = false;
+        battleBegin = false;
+        startES = true;
+        
+        redWinFlag = false;
+        blueWinFlag = false;
+        battleFlag = false;
+        battleRdy = false;
+        
+        mapChipDataLoadFail = false;
+        return;
+    }else if(initMapFlag){
+        mapChipDataLoadProc++;
+    }
+    
+    if(mapChipDataLoadProc > 2)
+        mapChipDataLoadProc = 2;
+    
+    if(mapChipDataLoadProc == 1){
+        [fsWindow makeKeyAndOrderFront:nil];
+        [esWindow close];
+        [titleWindow close];
+        mapChipDataLoadProc++;
+    }
+    
     if(unitBreak){
         if(unitBreak->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2){
             unitBreak->CPU = true;
@@ -1757,37 +1796,6 @@
         buildSelectedFlag = false;
     }
     
-    if(mapChipDataLoadFail){
-        [endGamePanel close];
-        
-        endGameCondition = false;
-        initMapFlag = false;
-        TeamCountFlag = false;
-        initStatusFlag = false;
-        battleBegin = false;
-        startES = true;
-        
-        redWinFlag = false;
-        blueWinFlag = false;
-        battleFlag = false;
-        battleRdy = false;
-        
-        mapChipDataLoadFail = false;
-        return;
-    }else if(initMapFlag){
-        mapChipDataLoadProc++;
-    }
-    
-    if(mapChipDataLoadProc > 2)
-        mapChipDataLoadProc = 2;
-    
-    if(mapChipDataLoadProc == 1){
-        [fsWindow makeKeyAndOrderFront:nil];
-        [esWindow close];
-        [titleWindow close];
-        mapChipDataLoadProc++;
-    }
-    
     if(TeamCountFlag && !endGameCondition){
         U = UTop;
         TeamCount0 = 0;
@@ -12552,6 +12560,60 @@ SKIP1:
     
     
 }
+
+
+-(void)displaySideMenu{
+    
+    [FSMenu setFrameOrigin:NSMakePoint([fsWindow frame].origin.x + [fsWindow frame].size.width/2 - FSMenu.frame.size.width/2,
+                                       [fsWindow frame].origin.y + [fsWindow frame].size.height/2 - FSMenu.frame.size.height/2)];
+    [FSMenu makeKeyAndOrderFront:nil];
+    
+    coolTime = true;
+}
+
+-(IBAction)FSVtitle:(id)sender{
+    
+    [titleWindow makeKeyAndOrderFront:nil];
+    [fsWindow close];
+    [FSMenu close];
+    
+    esSceneProc = 0;
+    
+    [BGMsub stop];
+    
+    endGameCondition = false;
+    initMapFlag = false;
+    TeamCountFlag = false;
+    initStatusFlag = false;
+    battleBegin = false;
+    startES = true;
+    
+    cpuModeMOVEflag = false;
+    cpuModeATTACKflag = false;
+    
+    redWinFlag = false;
+    blueWinFlag = false;
+    cpuAImodeflag = false;
+    cpuTurnEndFlag = true;
+    backTitleFlag = false;
+    backTitleFlag2 = true;
+    waitSwtichFlag = false;
+    battleReadyUpFlag = false;
+    setBattleModeFlag = false;
+    mapChipDataLoadProc = 0;
+    
+    wtRdy = false;
+    wtRdy2 = false;
+    
+    Uselected = NULL;
+    
+}
+-(IBAction)FSVcancel:(id)sender{
+    
+    coolTime = false;
+    [FSMenu close];
+    
+}
 @end
 
 
diff --git a/Awars III/FieldView.h b/Awars III/FieldView.h
index f4cf6ae..d1c109a 100755
--- a/Awars III/FieldView.h	
+++ b/Awars III/FieldView.h	
@@ -175,6 +175,19 @@ bool CPUturn;
 
 -(void)modeCPUturn;
 
+
+-(IBAction)FSVtitle:(id)sender;
+-(IBAction)FSVcancel:(id)sender;
 //-(void)loadMesh:(NSMutableArray *)theMapString;
 @end
 FieldView *fieldView;
+
+
+@interface FieldSideView : NSView
+{
+}
+
+@end
+
+
+
diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index e24bce5..7d09c71 100755
--- a/Awars III/FieldView.m	
+++ b/Awars III/FieldView.m	
@@ -4353,4 +4353,47 @@
     
 }
 
+
+
+
+
 @end
+
+
+
+
+
+
+
+@implementation FieldSideView
+
+
+-(void)mouseDown:(NSEvent *)theEvent{
+
+    [fieldScene displaySideMenu];
+    
+}
+
+@end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 3719f43..b42fab7 100755
--- a/Awars III/en.lproj/MainMenu.xib	
+++ b/Awars III/en.lproj/MainMenu.xib	
@@ -1814,6 +1814,7 @@
                 <outlet property="CResearchListTV" destination="12687" id="12777"/>
                 <outlet property="CSummonListAC" destination="14036" id="14100"/>
                 <outlet property="CSummonListTV" destination="14006" id="14059"/>
+                <outlet property="FSMenu" destination="9Dl-Bn-qBx" id="p5l-20-79p"/>
                 <outlet property="GameOverIV" destination="aC9-rN-s1T" id="z8g-LG-STF"/>
                 <outlet property="GameOverWindow" destination="Z8H-DC-plw" id="c5c-wz-IzH"/>
                 <outlet property="HPBarLI" destination="11176" id="11206"/>
@@ -9140,6 +9141,10 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
+                    <customView id="C6A-AL-lae" customClass="FieldSideView">
+                        <rect key="frame" x="481" y="-1" width="159" height="481"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
                 </subviews>
             </view>
         </window>
@@ -22414,6 +22419,41 @@
             </view>
             <point key="canvasLocation" x="1022" y="3290"/>
         </window>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="9Dl-Bn-qBx" customClass="NSPanel">
+            <windowStyleMask key="styleMask" utility="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="112" width="150" height="88"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
+            <view key="contentView" id="ek3-5w-teB">
+                <rect key="frame" x="0.0" y="0.0" width="150" height="88"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button verticalHuggingPriority="750" id="vUa-oQ-Afp">
+                        <rect key="frame" x="10" y="40" width="131" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="タイトルへ戻る" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4FK-Zq-NxZ">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="FSVtitle:" target="10496" id="2MI-Tc-iEU"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="uHc-M2-9DT">
+                        <rect key="frame" x="10" y="13" width="131" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="キャンセル" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QV6-bt-OFb">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="FSVcancel:" target="10496" id="h95-Kp-z7A"/>
+                        </connections>
+                    </button>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="830" y="-1672"/>
+        </window>
     </objects>
     <resources>
         <image name="BackGround" width="32" height="32"/>
-- 
2.11.0