From 04481c298a5df5dd0327d64284db9ed80bf619e4 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 9 Dec 2015 08:22:44 -0500
Subject: music fading
---
src/gameplay.cpp | 1 +
src/ui.cpp | 5 ++---
src/world.cpp | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index f665b38..07f5572 100644
--- 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 d72bf2c..04123c3 100644
--- 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 cb5f3ec..2fd3591 100644
--- 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){
--
cgit v1.2.3
From 4e3ceb550b26e3b7810b4493943db98918d7bef1 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 9 Dec 2015 08:28:39 -0500
Subject: npc facing
---
src/entities.cpp | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'src')
diff --git a/src/entities.cpp b/src/entities.cpp
index f2d7270..08af0a9 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -313,6 +313,10 @@ void NPC::interact(){ //have the npc's interact back to the player
if(aiFunc.size()){
func=aiFunc.front();
canMove=false;
+
+ left = (player->loc.x < loc.x);
+ right = !left;
+
if(!func(this)){
if(aiFunc.size())aiFunc.erase(aiFunc.begin());
}
--
cgit v1.2.3