music fading

diff --git a/include/ui.h b/include/ui.h
index a5a2ec05af59c376617edd09bb0d352963823d17..97e4bbf37d7c604ebad23623bd46935a9597afef 100644 (file)
--- a/include/ui.h
+++ b/include/ui.h
@@ -27,7 +27,7 @@ namespace ui {
        extern unsigned int fontSize;
        extern bool                      dialogBoxExists;
        extern unsigned char dialogOptChosen;
-       extern bool edown;
+       extern bool dialogImportant;
 
        /*
         *      Initializes the FreeType system.

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index f665b38322225b434b4548af79d1ce36a3fbfae4..07f5572642589cbab7809dce152a38d32df533d9 100644 (file)
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -52,6 +52,7 @@ void CUTSCENEEE2(Mob *callee){
 
 void story(Mob *callee){
        player->vel.x = 0;
+       Mix_FadeOutMusic(0);
        ui::importantText("It was a dark and stormy night...");
        ui::waitForDialog();
        ui::importantText("...and Clyne wanted to hear what the click track sounds like.");

diff --git a/src/ui.cpp b/src/ui.cpp
index d72bf2cff0e3fc6dabf49f813860856f3dce1383..04123c3ac2d062e736e79f65d25f5b338a1d44ef 100644 (file)
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -50,8 +50,6 @@ static float dialogOptLoc[4][3];
 static unsigned char dialogOptCount = 0;
 static bool typeOutDone = true;
 
-static bool dialogImportant = false;
-
 Mix_Chunk *dialogClick;
 
 extern void mainLoop(void);
@@ -91,7 +89,8 @@ namespace ui {
         *      Dialog stuff that needs to be 'public'.
        */
        
-       bool dialogBoxExists=false;
+       bool dialogBoxExists = false;
+       bool dialogImportant = false;
        unsigned char dialogOptChosen = 0;
        
        /*

diff --git a/src/world.cpp b/src/world.cpp
index cb5f3ecedc16b7e7798bc9237ba235011da20d2b..2fd35911503db8dce1a842949d7a11ff5a5992e6 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -285,6 +285,12 @@ void World::update(Player *p,unsigned int delta){
           else if(e->vel.x > 0)e->left = false;
                }
        }
+       
+       if(ui::dialogImportant){
+               Mix_FadeOutMusic(2000);
+       }else if(!Mix_PlayingMusic()){
+               Mix_FadeInMusic(bgmObj,-1,2000);
+       }
 }
 
 void World::setBGM(const char *path){