タイトルバックでBGM消えるのを改善

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index 4aaaac5..ad62eeb 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -39,7 +39,10 @@
     
     
     if(!startES) return;
-    if(titleBGM) [titleBGM stop];
+    if(titleBGM)
+        if(titleBGM.playing)
+            [titleBGM stop];
+    
     ST = NULL;
     static bool seFlag;
     
@@ -60,10 +63,7 @@
         dialogNumber = 1;
         startOrEndFlag = false;
         seFlag = false;
-        startES = false;
         backTitleFlag2 = false;
-        return;
-        
     }
     
     if(startOrEndFlag){

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 075d320..72b8877 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -15704,23 +15704,23 @@ SKIP1:
 -(IBAction)FSVtitle:(id)sender{
     
     stopByFSVmenuFlag = false;
-    
+    [BGMsub stop];
+    BGMsub = NULL;
+    if(titleBGM) [titleBGM play];
+
     [titleWindow makeKeyAndOrderFront:nil];
     [fsWindow close];
     [FSMenu close];
     
     esSceneProc = 0;
     
-    [BGMsub stop];
-    BGMsub = NULL;
-    if(titleBGM) [titleBGM play];
     
     endGameCondition = false;
     initMapFlag = false;
     TeamCountFlag = false;
     initStatusFlag = false;
     battleBegin = false;
-    startES = true;
+    startES = false;
     
     cpuModeMOVEflag = false;
     cpuModeATTACKflag = false;

diff --git a/Awars III/ScenarioList.m b/Awars III/ScenarioList.m
index 2b3cdcf..69f1b5f 100755 (executable)
--- a/Awars III/ScenarioList.m
+++ b/Awars III/ScenarioList.m
@@ -91,7 +91,6 @@
         k++;
     }
     
-    
     zOMG:
     
     scenarioNumb = k;
@@ -101,7 +100,10 @@
     [NSApp stopModal];
     esSceneProc = 0;
     evActive = true;
+    
     startClickedFlag = false;
+    
+    [SLPanel close];
 }
 
 -(id)init{