From 3633857dc82da5dc8e991da625430f986b16a142 Mon Sep 17 00:00:00 2001 From: Killery Date: Sun, 17 Apr 2016 20:19:05 +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.m | 7 +++++++ Awars III/FieldView.h | 1 + Awars III/FieldView.m | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m index 940a882..7ad8d10 100755 --- a/Awars III/FieldScene.m +++ b/Awars III/FieldScene.m @@ -1179,6 +1179,10 @@ -(void)EventLoopFS:(NSTimer*)time{ + if(stopByFSVmenuFlag){ + [FSMenu makeKeyAndOrderFront:nil]; + } + U = UTop; if(U){ U = UTop; @@ -12573,6 +12577,8 @@ SKIP1: -(IBAction)FSVtitle:(id)sender{ + stopByFSVmenuFlag = false; + [titleWindow makeKeyAndOrderFront:nil]; [fsWindow close]; [FSMenu close]; @@ -12610,6 +12616,7 @@ SKIP1: } -(IBAction)FSVcancel:(id)sender{ + stopByFSVmenuFlag = false; coolTime = false; [FSMenu close]; diff --git a/Awars III/FieldView.h b/Awars III/FieldView.h index d1c109a..f54e129 100755 --- a/Awars III/FieldView.h +++ b/Awars III/FieldView.h @@ -182,6 +182,7 @@ bool CPUturn; @end FieldView *fieldView; +bool stopByFSVmenuFlag; @interface FieldSideView : NSView { diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m index 7d09c71..144461d 100755 --- a/Awars III/FieldView.m +++ b/Awars III/FieldView.m @@ -486,6 +486,9 @@ -(void)mouseDown:(NSEvent *)theEvent{ + if(stopByFSVmenuFlag) + return; + if(cpuAtkExtendFlag3 || cpuOMFGmoveATKfixFlag) return; if(!battleBegin) return; @@ -1795,7 +1798,8 @@ switch (cpuMODE) { case MODE_CPU_IDLE: - + if(stopByFSVmenuFlag) + return; if(coolTime) return; @@ -4370,6 +4374,8 @@ -(void)mouseDown:(NSEvent *)theEvent{ + stopByFSVmenuFlag = true; + [fieldScene displaySideMenu]; } -- 2.11.0