added fade in to new game

and fixed music on new game

1 files changed, 9 insertions, 5 deletions

@@ -26,11 +26,6 @@ Muxer::Muxer() {
 
   FMOD::Studio::Bank* stringsBank = nullptr;
   ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.strings.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank));
-
-  FMOD::Studio::EventDescription* exploration_desc = nullptr;
-  ERRCHECK(system_->getEvent("event:/exploration", &exploration_desc));
-  ERRCHECK(exploration_desc->createInstance(&exploration_event_));
-  ERRCHECK(exploration_event_->start());
 }
 
 void Muxer::setPlayerLoc(int x, int y) {
@@ -96,6 +91,15 @@ void Muxer::setMusicLevel(int level) {
   }
 }
 
+void Muxer::startMusic() {
+  FMOD::Studio::EventDescription* exploration_desc = nullptr;
+  ERRCHECK(system_->getEvent("event:/exploration", &exploration_desc));
+  ERRCHECK(exploration_desc->createInstance(&exploration_event_));
+  ERRCHECK(exploration_event_->start());
+
+  transition_state_ = TransitionState::Pre;
+}
+
 void Muxer::stopMusic() {
   switch (transition_state_) {
     case TransitionState::Pre: {