asterisk with thread

1 files changed, 5 insertions, 4 deletions

diff --git a/vfg/src/music.cpp b/vfg/src/music.cpp
index 8f3b767..e715892 100755
--- a/vfg/src/music.cpp
+++ b/vfg/src/music.cpp
@@ -4,7 +4,7 @@
 

 int notemap(int n) {

 	//nonlinear mapping of notes to 3 columns - space 5,4,7 - trying 5,5,6

-	//note drawing 46h - 52h 

+	//note drawing 46h - 52h

 	int numnotes=16;

 	int firstnote=70;

 	int note=n-firstnote;

@@ -153,8 +153,9 @@ void musicscore::makeFlakes(int threshStart,int threshEnd,levelscore *levels){
 	flakes[notes.begin()->first]=new flake(notes.begin()->second->num,notes.begin()->second->velocity,notes.begin()->second->duration);

 	flakes[notes.begin()->first]->puppet=snowflakes[notemap(lastNote->num)];

 	for (iter = notes.begin(); iter != notes.end(); iter++) {

-		float songPos=((float)iter->first)/songDuration;

-		if ((levels->nextLevelTime(iter->first)>2000)&&((notemap(iter->second->num)!=notemap(lastNote->num))||(iter->first-lastTime>((songPos*threshEnd)+((1.0f-songPos)*threshStart))))) {

+		float songPos=((float)iter->first)/songDuration;
+		//((notemap(iter->second->num)!=notemap(lastNote->num))||

+		if ((levels->nextLevelTime(iter->first)>2000)&&(iter->first-lastTime>((songPos*threshEnd)+((1.0f-songPos)*threshStart)))) {

 			flakes[iter->first]=new flake(iter->second->num,iter->second->velocity,iter->second->duration);

 			flakes[iter->first]->puppet=snowflakes[notemap(iter->second->num)];

 			lastNote=iter->second;

@@ -235,7 +236,7 @@ void musicscore::drawFlakes(float hOffs,levelscore *levels,float scale) {
 		missedLast=!iter->second->activated;

 	}

 	//at this point missed points to the latest unactivated flake in the level if there is one or else flakes.end()

-	
+
 	if ((missed!=flakes.end())&&(missedFlake!=missed)) {
 	    missedFlake=missed;
 	    missedNote=notemap(missed->second->num);