characters reacting to level ends

1 files changed, 32 insertions, 14 deletions

diff --git a/vfg/src/testApp.cpp b/vfg/src/testApp.cpp
index ab044a9..4385593 100755
--- a/vfg/src/testApp.cpp
+++ b/vfg/src/testApp.cpp
@@ -1,30 +1,32 @@
 #include "testApp.h"
-
+//bug in codeblocks: it sometimes checks for existence of executable from previous project
 //--------------------------------------------------------------
 void testApp::setup(){
 
-	testsong=new song("VODA_MUS_DeckTheHalls-Backing_v.1.5.mp3","VODA_MUS_DeckTheHalls-Melody_v.1.5.mp3","MIDI_DeckTheHalls_MIDI.1.5.xml","Lyrics_DeckTheHalls.1.5.xml","Levels_DeckTheHalls.1.5.xml");
-	testsong->setTimeframe(2500);
+	//testsong=new song("VODA_MUS_DeckTheHalls-Backing_v.1.5.mp3","VODA_MUS_DeckTheHalls-Melody_v.1.5.mp3","MIDI_DeckTheHalls_MIDI.1.5.xml","Lyrics_DeckTheHalls.1.5.xml","Levels_DeckTheHalls.1.5.xml");
+	testsong=new song("JingleBells_v.4.0/VODA_MUS_JingleBells_Backing_v.4.0.mp3","JingleBells_v.4.0/VODA_MUS_JingleBells_Melody_v.4.0.mp3","VODA_MUS_JingleBells_MIDI_v.4.0.xml","Lyrics_JingleBells.4.0.xml","Levels_JingleBells.4.0.xml");
+	
+	testsong->setTimeframe(3000);
 	testsong->setFlakeThresh(1000,100);
 
 	ofSetBackgroundAuto(false);
 	ofBackground(0,0,0);
 
-	/*
+	
 	for (int i=0;i<3;i++) penguins.push_back(Animal());
 	penguins[0].load("Penguin-Blue.xml");
 	penguins[1].load("Penguin-Purple.xml");
 	penguins[2].load("Penguin-Green.xml");
 
-    for (int i=0;i<3;i++) raccoons.push_back(Animal());
+	for (int i=0;i<3;i++) raccoons.push_back(Animal());
 	raccoons[0].load("Raccoon-Blue.xml");
 	raccoons[1].load("Raccoon-Purple.xml");
 	raccoons[2].load("Raccoon-Green.xml");
-	*/
 	
 	
-	loadanimals("Raccoons");
-	playanimal =&playanimals;
+	
+	//loadanimals("Raccoons");
+	playanimal =&penguins;
 
 	//testpenguin.load("Penguin-Blue.xml");
 	//debug: commented out: 	436m 257m
@@ -41,8 +43,9 @@ void testApp::setup(){
 
 	showFPS=false;
 
-}
 
+}
+/*
 void testApp::loadanimals(string which) {
 	playanimals.clear();
 	
@@ -60,6 +63,7 @@ void testApp::loadanimals(string which) {
 	}
 	
 }
+*/
 
 void testApp::exit(){
 	delete testsong;
@@ -69,11 +73,22 @@ void testApp::exit(){
 void testApp::update(){
 	int ret=game.update();
 	if (ret==1000) {
+		currentlevel=0;
 		testsong->preRoll(250);
 	}
-	else if (ret>0) {
-		testsong->playerControl(ret);
-		(*playanimal)[ret-1].playNow("Clap");
+	else if (ret>48&&ret<52) {
+		testsong->playerControl(ret-48);
+		(*playanimal)[ret-49].playNow("Clap");
+	}
+	if (testsong->isPlaying&&testsong->getLevel(ofGetElapsedTimeMillis()+2000)>currentlevel) {
+		int anim=ofRandom(1.9999); //this gives a binary random number
+		for (int i=0;i<3;i++) {
+			if (anim) (*playanimal)[i].playNow("Happy");
+			else (*playanimal)[i].playNow("Jump");
+			anim=(anim+1)%2;
+		}
+		//printf("finished level %i!\n",currentlevel);
+		currentlevel++;
 	}
 	for (int i=0;i<3;i++) {
 		(*playanimal)[i].update();
@@ -121,6 +136,7 @@ void testApp::keyPressed(int key){
 	switch (key) {
 		case ' ':
 			if (!testsong->isPlaying) {
+				currentlevel=0;
 				testsong->preRoll(250);
 			}
 			break;
@@ -137,10 +153,12 @@ void testApp::keyPressed(int key){
 			showFPS=!showFPS;
 			break;
         case 'r':
-			loadanimals("Raccoons");
+			//loadanimals("Raccoons");
+			playanimal =&raccoons;
 			break;
         case 'p':
-			loadanimals("Penguins");
+			//loadanimals("Penguins");
+			playanimal =&penguins;
 			break;
 	}