summaryrefslogtreecommitdiff
path: root/vfg/src/music.cpp
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2012-12-18 12:45:26 +0000
committerComment <tim@gray.(none)>2012-12-18 12:45:26 +0000
commit27e13ea8412d2a1f46345f9c0fcafa1e86551728 (patch)
tree68b083f478b92029c1cbd8b8c2b431528c35495d /vfg/src/music.cpp
parent066b911b19d93191fd5a89b8cd14c51aa18e2fd9 (diff)
final dublin version
Diffstat (limited to 'vfg/src/music.cpp')
-rwxr-xr-xvfg/src/music.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vfg/src/music.cpp b/vfg/src/music.cpp
index a3ebfc5..4c565bb 100755
--- a/vfg/src/music.cpp
+++ b/vfg/src/music.cpp
@@ -334,7 +334,7 @@ bool song::isFinished(){
void song::resize(){
lyrics.loadFont();
}
-void song::draw(float hOffs,float scale){
+void song::draw(float hOffs,float scale,bool showLyrics){
int songTime=ofGetElapsedTimeMillis()-startTime;
int fadeout=(gameover?max(0,255-((int)((((float)ofGetElapsedTimeMillis()-gameoverTime)/fademillis)*255))):255);
if (isPlaying) {
@@ -359,7 +359,7 @@ void song::draw(float hOffs,float scale){
}
}
if (!notes.missedLast&&!gameover) melody.setVolume(1.0f);
- if (!isPractice&&!gameover) lyrics.draw(hOffs);
+ if (!isPractice&&!gameover&&showLyrics) lyrics.draw(hOffs);
if (songTime>levels.length&&!gameover) {
printf("finished! %i (%i)\n",songTime,levels.length);
//this played loads of times