From 71e25fd7fa0703cb97e23a90adfe6bb7c786285f Mon Sep 17 00:00:00 2001
From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com>
Date: Sat, 30 Oct 2021 16:21:01 +0300
Subject: [PATCH] Merge from master: control bugfix, no delay FT THole.

---
 SpaceCadetPinball/THole.cpp   | 6 +++++-
 SpaceCadetPinball/control.cpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SpaceCadetPinball/THole.cpp b/SpaceCadetPinball/THole.cpp
index cb06149..fc3e0aa 100644
--- a/SpaceCadetPinball/THole.cpp
+++ b/SpaceCadetPinball/THole.cpp
@@ -82,7 +82,11 @@ void THole::Collision(TBall* ball, vector_type* nextPosition, vector_type* direc
 		ball->Position.X = Circle.Center.X;
 		ball->Position.Y = Circle.Center.Y;
 		ball->Acceleration.Z = 0.0;
-		Timer = timer::set(0.5f, this, TimerExpired);
+
+		// Ramp hole has no delay in FT.
+		auto captureTime = pb::FullTiltMode ? 0 : 0.5f;
+		Timer = timer::set(captureTime, this, TimerExpired);
+
 		if (!PinballTable->TiltLockFlag)
 		{
 			loader::play_sound(HardHitSoundId);
diff --git a/SpaceCadetPinball/control.cpp b/SpaceCadetPinball/control.cpp
index a23cb3d..21b2a80 100644
--- a/SpaceCadetPinball/control.cpp
+++ b/SpaceCadetPinball/control.cpp
@@ -2916,7 +2916,7 @@ void control::GameoverController(int code, TPinballComponent* caller)
 
 	if (missionMsg & 0x200)
 	{
-		int highscoreId = missionMsg % 4;
+		int highscoreId = missionMsg % 5;
 		int highScore = pb::highscore_table[highscoreId].Score;
 		auto nextHidhscoreId = highscoreId + 1;
 		if (highScore > 0)