Initial release bugfix 2 (#87)

* Fix note generation using the wrong snaps

* Prevent entering zero BPM

Author: uvcat7

src/Dialogs/AdjustSync.cpp

@@ -192,7 +192,10 @@ void DialogAdjustSync::onAction(int id)
 		gTempo->setOffset(myOffset);
 	} break;
 	case ACT_SET_BPM: {
-		gTempo->addSegment(BpmChange(0, myInitialBPM));
+		if (myInitialBPM != 0.0)
+		{
+			gTempo->addSegment(BpmChange(0, myInitialBPM));
+		}
 	} break;
 	case ACT_TWEAK_BPM: {
 		gTempo->startTweakingBpm(0);

src/Dialogs/AdjustTempo.cpp

@@ -165,7 +165,10 @@ void DialogAdjustTempo::onAction(int id)
 	switch(id)
 	{
 	case ACT_BPM_SET: {
-		gTempo->addSegment(BpmChange(row, myBPM));
+		if (myBPM != 0.0)
+		{
+			gTempo->addSegment(BpmChange(row, myBPM));
+		}
 	} break;
 	case ACT_BPM_HALVE:
 	case ACT_BPM_DOUBLE: {

src/Editor/StreamGenerator.cpp

@@ -28,11 +28,6 @@ enum Foot
 	FOOT_R = 1
 };
 
-static const int RowSnapTypes[NUM_SNAP_TYPES] =
-{
-	1, 48, 24, 16, 12, 10, 8, 6, 4, 3, 2, 1
-};
-
 static float GetPadDist(vec2i* pad, int colA, int colB)
 {
 	float dx = (float)(pad[colA].x - pad[colB].x);
@@ -280,7 +275,7 @@ void StreamGenerator::generate(int row, int endRow, SnapType spacing)
 
 	int facingLeft = 0;
 	int facingRight = 0;
-	int rowDelta = RowSnapTypes[spacing];
+	int rowDelta = sRowSnapTypes[spacing];
 	int rowDeltaIndex = 0;
 	while(row < endRow)
 	{
@@ -294,17 +289,7 @@ void StreamGenerator::generate(int row, int endRow, SnapType spacing)
 		facingLeft += yl < yr;
 		facingRight += yr < yl;
 
-		// Advance to the next row position.
-		if(rowDelta == 10)
-		{
-			static const int deltas[5] = {10, 9, 10, 9, 10};
-			row += deltas[rowDeltaIndex];
-			if(++rowDeltaIndex == 5) rowDeltaIndex = 0;
-		}
-		else
-		{
-			row += rowDelta;
-		}
+		row += rowDelta;
 	}
 
 	// Some debug statistics.

src/Editor/View.cpp

@@ -31,11 +31,6 @@
 namespace Vortex {
 namespace {
 
-static const int sRowSnapTypes[NUM_SNAP_TYPES] =
-{
-	1, 48, 24, 16, 12, 8, 6, 4, 3, 2, 1, 0
-};
-
 }; // anonymous namespace
 
 // ================================================================================================

src/Editor/View.h

@@ -4,6 +4,11 @@
 
 namespace Vortex {
 
+static const int sRowSnapTypes[NUM_SNAP_TYPES] =
+{
+	1, 48, 24, 16, 12, 8, 6, 4, 3, 2, 1, 0
+};
+
 // Represents a time stamp in time-based mode, and a row in row-based mode.
 typedef double ChartOffset;