fixed a bug which sometimes caused miscalculated column heights

games/tetris/variant_bastet.c

@@ -36,9 +36,13 @@ void tetris_bastet_doPreprocessing(tetris_bastet_variant_t *pBastet)
 	// retrieve sane start and stop values for the column and row indices
 	int8_t nWidth = tetris_bucket_getWidth(pBastet->pBucket);
 	int8_t nStartRow = tetris_bucket_getHeight(pBastet->pBucket) - 1;
-	int8_t nStopRow = tetris_bucket_getFirstMatterRow(pBastet->pBucket);
+	int8_t nStopRow = tetris_bucket_getFirstTaintedRow(pBastet->pBucket);
-//	printf("%d ", nStopRow);
 
+	// clear old precalculated scores
+	for (int i = 0; i < nWidth + 3; ++i)
+	{
+		pBastet->pColScore[i] = 0;
+	}
 	// calculate the column heights of the actual bucket configuration
 	// NOTE: in this loop, pColScore contains the actual column heights,
 	//       later it will contain the "score impact" of every unchanged column
@@ -56,14 +60,6 @@ void tetris_bastet_doPreprocessing(tetris_bastet_variant_t *pBastet)
 		}
 	}
 
-//	printf("-------------------------------------------\n           ");
-//	for (int i = 0; i < nWidth; ++i)
-//	{
-//		printf("%2d ", pBastet->pColScore[i]);
-//	}
-//	printf("\n");
-
-
 	// starting points for collision detection (to speedup things)
 	// calculate the maxima of the 4-tuples from column -3 to -1
 	pBastet->pStartingRow[0] = pBastet->pColScore[0];
@@ -82,13 +78,6 @@ void tetris_bastet_doPreprocessing(tetris_bastet_variant_t *pBastet)
 				pBastet->pColScore[t0] > pBastet->pColScore[t1] ?
 				pBastet->pColScore[t0] : pBastet->pColScore[t1];
 	}
-//	for (int i = 0; i < nWidth + 3; ++i)
-//	{
-//		printf("%2d ", pBastet->pStartingRow[i]);
-//		if (i == 2)
-//			printf("| ");
-//	}
-//	printf("\n");
 	// normalize to bucket geometry
 	for (uint8_t i = 0; i < nWidth + 3; ++i)
 	{
@@ -100,15 +89,6 @@ void tetris_bastet_doPreprocessing(tetris_bastet_variant_t *pBastet)
 	{
 		pBastet->pColScore[x] *= TETRIS_BASTET_HEIGHT_FACTOR;
 	}
-
-//	for (int i = 0; i < nWidth + 3; ++i)
-//	{
-//		printf("%2d ", pBastet->pStartingRow[i]);
-//		if (i == 2)
-//			printf("| ");
-//	}
-//	printf("\n");
-
 }