diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp index 7c8854e..85ca203 100644 --- a/SpaceCadetPinball/options.cpp +++ b/SpaceCadetPinball/options.cpp @@ -136,9 +136,6 @@ void options::ReadOptions() Options.BottomTableBumpKey = get_int(nullptr, "Bottom Table Bump key", Options.BottomTableBumpKey); Options.UniformScaling = get_int(nullptr, "Uniform scaling", true); Options.AlternativeRender = get_int(nullptr, "Alternative Render", false); - Options.TargetUps = get_int(nullptr, "Target UPS", 120); - Options.TargetUps = max(60, Options.TargetUps); - Options.TargetUps = min(Options.TargetUps, 360); auto defaultLanguage = Languages::English; auto language = static_cast(get_int(nullptr, "Language", static_cast(defaultLanguage))); @@ -238,7 +235,6 @@ void options::uninit() set_int(nullptr, "Uniform scaling", Options.UniformScaling); set_int(nullptr, "Alternative Render", Options.AlternativeRender); set_int(nullptr, "Language", static_cast(Options.Language)); - set_int(nullptr, "Target UPS", Options.TargetUps); } void options::path_init(LPCSTR regPath) diff --git a/SpaceCadetPinball/options.h b/SpaceCadetPinball/options.h index 0b489d0..9f347e4 100644 --- a/SpaceCadetPinball/options.h +++ b/SpaceCadetPinball/options.h @@ -59,7 +59,6 @@ struct optionsStruct int Resolution; bool UniformScaling; bool AlternativeRender; - int TargetUps; Languages Language; }; diff --git a/SpaceCadetPinball/pb.cpp b/SpaceCadetPinball/pb.cpp index 6a4282f..19fde64 100644 --- a/SpaceCadetPinball/pb.cpp +++ b/SpaceCadetPinball/pb.cpp @@ -270,13 +270,9 @@ void pb::frame(float dtMilliSec) // Retained render prevents frame skip. The next best thing - complete refresh at fixed rate. render::update(false); - // Redraw is slower, as a compromise it is done at FPS = UPS / 2 - auto targetFps = options::Options.TargetUps / 2.0f; - targetFps = max(targetFps, 60.0f); // at least 60 - - auto targetTime = 1000.0f / targetFps; + // Frame time at 60 FPS = 16.(6) ms + auto targetTime = 1000 / 60.0f; frameTime += dtMilliSec; - if (frameTime >= targetTime) { frameTime = min(frameTime - targetTime, 100); diff --git a/SpaceCadetPinball/winmain.cpp b/SpaceCadetPinball/winmain.cpp index 92a7a69..a54e666 100644 --- a/SpaceCadetPinball/winmain.cpp +++ b/SpaceCadetPinball/winmain.cpp @@ -12,6 +12,8 @@ #include "splash.h" #include "render.h" +const float TargetUPS = 120, TargetFrameTime = 1000 / TargetUPS; + HINSTANCE winmain::hinst = nullptr; HWND winmain::hwnd_frame = nullptr; HCURSOR winmain::mouse_hsave; @@ -225,7 +227,6 @@ int winmain::WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi else pb::replay_level(0); - float TargetFrameTime = 1000.0f / options::Options.TargetUps; DWORD someTimeCounter = 300u, prevTime = 0u, frameStart = timeGetTime(); float sleepRemainder = 0, frameDuration = TargetFrameTime; while (true)