New lockdown mechanics

The piece lockdown was previously tied to the falling-speed,
or if garbage was pushed up into the piece it would instantly lockdown.
New system has added a static lockdown-time of 400ms in all cases.
This works much more similar to what cultris uses and gives better control
for softdroping with high stack or while garbage is being pushed up.

gamePlay.cpp

@@ -34,6 +34,7 @@ void gamePlay::startGame() {
 	oldbpmCount=0;
 	autoaway=true;
 	position=0;
+	lockdown=false;
 	for (int i=0; i<10; i++)
 		oldbpm[i]=0;
 	setComboTimer();
@@ -105,9 +106,14 @@ void gamePlay::mDown() {
 	if (possible()) {
 		draw();
 		dclock.restart();
+		lockdown=false;
 	}
-	else
+	else {
 		piece.mup();
+		if (!lockdown)
+			lockDownTime=keyclock.getElapsedTime()+sf::milliseconds(400);
+		lockdown=true;
+	}
 }
 
 void gamePlay::hd() {
@@ -269,13 +275,13 @@ void gamePlay::delayCheck() {
 		piece.mdown();
 		if (possible()) {
 			draw();
+			lockdown=false;
 		}
 		else {
 			piece.mup();
-			addPiece();
-			sendLines(field.clearlines());
-			makeNewPiece();
-			draw();
+			if (!lockdown)
+				lockDownTime=keyclock.getElapsedTime()+sf::milliseconds(400);
+			lockdown=true;
 		}
 		dclock.restart();
 	}
@@ -302,6 +308,21 @@ void gamePlay::delayCheck() {
 			dKeyTime+=options.repeatSpeedDown;
 		}
 
+	if (lockdown && keyclock.getElapsedTime() > lockDownTime) {
+		piece.mdown();
+		if (!possible()) {
+			piece.mup();
+			addPiece();
+			sendLines(field.clearlines());
+			makeNewPiece();
+			draw();
+		}
+		else {
+			piece.mup();
+			lockdown=false;
+		}
+	}
+
 	if (keyclock.getElapsedTime() > comboStart+comboTime && comboCount!=0) {
 		sf::Uint16 comboLinesSent = comboCount * pow(1.1, comboCount);
 
@@ -505,9 +526,9 @@ void gamePlay::pushGarbage() {
 
 	if (!possible()) {
 		piece.mup();
-		addPiece();
-		sendLines(field.clearlines());
-		makeNewPiece();
+		if (!lockdown)
+			lockDownTime=keyclock.getElapsedTime()+sf::milliseconds(400);
+		lockdown=true;
 	}
 }
 

gamePlay.h

@@ -45,6 +45,8 @@ class gamePlay {
 		sendgameover=false;
 		winner=false;
 
+		lockdown=false;
+
 		rKey=false;
 		lKey=false;
 		dKey=false;
@@ -105,6 +107,9 @@ class gamePlay {
 	sf::Time countDownTime;
 	short countDowncount;
 
+	sf::Time lockDownTime;
+	bool lockdown;
+
 	sf::Uint16 linesSent;
 	sf::Uint16 linesRecieved;
 	short comboCount;