From 066b911b19d93191fd5a89b8cd14c51aa18e2fd9 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Fri, 14 Dec 2012 12:53:44 +0000
Subject: ready for Dublin

---
 vfg/src/music.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'vfg/src/music.h')

diff --git a/vfg/src/music.h b/vfg/src/music.h
index c4a26ca..8792d6a 100755
--- a/vfg/src/music.h
+++ b/vfg/src/music.h
@@ -131,10 +131,8 @@ class lyricscore: public score {
 	//draws lyrics to screen for a certain time
 	public:
         lyricscore() {
-		font.loadFont("VodafoneRg_Bd.ttf", 31*(ofGetHeight()/1080.0f), true, true); //hard coded scaling
-		font.setLineHeight(34.0f);
-		font.setLetterSpacing(1.035);
-		fadeout=500; //ms
+            fadeout=500; //ms
+            loadFont();
         }
 		void load(string filename) {
 			if( !XML.loadFile(filename) ){
@@ -151,6 +149,11 @@ class lyricscore: public score {
 
 			}
 		}
+		void loadFont() {
+            font.loadFont("VodafoneRg_Bd.ttf", 31*(ofGetHeight()/1080.0f), true, true); //hard coded scaling
+            font.setLineHeight(34.0f);
+            font.setLetterSpacing(1.035);
+		}
 		void draw(float hOffs);
 	private:
 		map<int,lyric*> lyrics;
@@ -213,7 +216,8 @@ class song {
 		bool isGameover();
 		void gameOver();
 		bool isFinished();
-		bool gameover;
+		bool gameover;
+		void resize();
 
 		musicscore notes;
 	private:
-- 
cgit v1.2.3