SpaceCadetPinball/TPlunger.cpp

@@ -60,8 +60,7 @@ int TPlunger::Message(MessageCode code, float value)
 	switch (code)
 	{
 	case MessageCode::PlungerInputPressed:
-		if (!PullbackStartedFlag && (!pb::FullTiltMode || PinballTable->MultiballCount > 0 && !PinballTable->
+		if (!PullbackStartedFlag && PinballTable->MultiballCount > 0 && !PinballTable->TiltLockFlag)
-			TiltLockFlag))
 		{
 			PullbackStartedFlag = true;
 			Boost = 0.0;

SpaceCadetPinball/options.cpp

@@ -151,7 +151,6 @@ optionsStruct options::Options
 	{"Debug Overlay AABB", true},
 	{"FontFileName", ""},
 	{"Language", translations::GetCurrentLanguage()->ShortName},
-	{"Hide Cursor", false},
 };
 
 void options::InitPrimary()

SpaceCadetPinball/options.h

@@ -288,5 +288,4 @@ struct optionsStruct
 	BoolOption DebugOverlayAabb;
 	StringOption FontFileName;
 	StringOption Language;
-	BoolOption HideCursor;
 };

SpaceCadetPinball/winmain.cpp

@@ -49,7 +49,6 @@ winmain::DurationMs winmain::TargetFrameTime;
 optionsStruct& winmain::Options = options::Options;
 winmain::DurationMs winmain::SpinThreshold = DurationMs(0.005);
 WelfordState winmain::SleepState{};
-int winmain::CursorIdleCounter = 0;
 
 int winmain::WinMain(LPCSTR lpCmdLine)
 {
@@ -354,8 +353,6 @@ void winmain::MainLoop()
 
 			if (UpdateToFrameCounter >= UpdateToFrameRatio)
 			{
-				if (Options.HideCursor && CursorIdleCounter <= 0)
-					ImGui::SetMouseCursor(ImGuiMouseCursor_None);
 				ImGui_ImplSDL2_NewFrame();
 				ImGui_Render_NewFrame();
 				ImGui::NewFrame();
@@ -423,8 +420,6 @@ void winmain::MainLoop()
 			frameDuration = std::min<DurationMs>(DurationMs(frameEnd - frameStart), 2 * TargetFrameTime);
 			frameStart = frameEnd;
 			UpdateToFrameCounter++;
-
-			CursorIdleCounter = std::max(CursorIdleCounter - static_cast<int>(frameDuration.count()), 0);
 		}
 	}
 
@@ -586,6 +581,10 @@ void winmain::RenderUi()
 
 			if (ImGui::BeginMenu("Graphics"))
 			{
+				if (ImGui::MenuItem("Change Font"))
+				{
+					font_selection::ShowDialog();
+				}
 				if (ImGui::MenuItem(pb::get_rc_string(Msg::Menu1_WindowUniformScale), nullptr, Options.UniformScaling))
 				{
 					options::toggle(Menu1::WindowUniformScale);
@@ -641,16 +640,6 @@ void winmain::RenderUi()
 				{
 					UpdateFrameRate();
 				}
-				ImGui::Separator();
-
-				if (ImGui::MenuItem("Hide Cursor", nullptr, Options.HideCursor))
-				{
-					Options.HideCursor ^= true;
-				}
-				if (ImGui::MenuItem("Change Font..."))
-				{
-					font_selection::ShowDialog();
-				}
 
 				ImGui::EndMenu();
 			}
@@ -843,21 +832,6 @@ int winmain::event_handler(const SDL_Event* event)
 	if (!options::WaitingForInput() || !inputDown)
 		ImGui_ImplSDL2_ProcessEvent(event);
 
-	bool mouseEvent;
-	switch (event->type)
-	{
-	case SDL_MOUSEMOTION:
-	case SDL_MOUSEBUTTONDOWN:
-	case SDL_MOUSEBUTTONUP:
-	case SDL_MOUSEWHEEL:
-		CursorIdleCounter = 1000;
-		mouseEvent = true;
-		break;
-	default:
-		mouseEvent = false;
-		break;
-	}
-
 	if (ImIO->WantCaptureMouse && !options::WaitingForInput())
 	{
 		if (mouse_down)
@@ -865,8 +839,15 @@ int winmain::event_handler(const SDL_Event* event)
 			mouse_down = 0;
 			SDL_SetWindowGrab(MainWindow, SDL_FALSE);
 		}
-		if (mouseEvent)
+		switch (event->type)
+		{
+		case SDL_MOUSEMOTION:
+		case SDL_MOUSEBUTTONDOWN:
+		case SDL_MOUSEBUTTONUP:
+		case SDL_MOUSEWHEEL:
 			return 1;
+		default: ;
+		}
 	}
 	if (ImIO->WantCaptureKeyboard && !options::WaitingForInput())
 	{

SpaceCadetPinball/winmain.h

@@ -106,7 +106,6 @@ private:
 	static unsigned PrevSdlErrorCount;
 	static unsigned gfrOffset;
 	static float gfrWindow;
-	static int CursorIdleCounter;
 
 	static void RenderUi();
 	static void RenderFrameTimeDialog();