1 files changed, 23 insertions, 1 deletions

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index c287fb1..4852073 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -73,14 +73,19 @@ class testApp : public ofxFensterListener{
 		void gotMessage(ofMessage msg);
 		
 		void drawBackgroundLayers();
+		void activateGame();
+		void activatePractice();
+		void switchAnimals();
 	
 		ofVideoPlayer intro;
 		ofVideoPlayer advert;
+		ofSoundPlayer backgroundmusic;
 
 		ofVideoPlayer background;
 		ofImage vignette;
 
 		vector<song*> songs;
+		song practiceSong;
 
 	
 		vector<Animal> penguins;
@@ -96,6 +101,7 @@ class testApp : public ofxFensterListener{
 		vector<Billboard*> logos;
 		
 		puppetSprite banner;
+		puppetSprite wirebirds;
 		
 		Billboard* lyricspanel;
 
@@ -103,12 +109,15 @@ class testApp : public ofxFensterListener{
 		int currentlevel;
 
 		Asterisk game;
+		int gamepoll;
 
 		bool showFPS;
 		bool showVis;
 		bool fullscreenoutput;
 		
-		int currentsong,nextsong,gamestate,segmentStartTime,fadelength;
+		int currentsong,nextsong,gamestate,segmentStartTime;
+		
+		float fadelength;
 		
 		guiWindow *guiWin;
 		ofxPanel gui;
@@ -132,6 +141,19 @@ public:
 	void draw();
 	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 	void windowMoved(int x, int y);
+	string levelnames[11]={
+		"STARTINGINTRO",
+		"INTRO",
+		"ENDINGINTRO",
+		"READY",
+		"STARTINGADVERT",
+		"ADVERT",
+		"ENDINGADVERT",
+		"STARTPLAYING",
+		"PRACTICE",
+		"PLAYING",
+		"ENDPLAYING"
+		};
 };