backport timer fixes

Author: AL2009man

game_patch/input/mouse.cpp

@@ -304,36 +304,61 @@ void linear_pitch_test()
 }
 #endif // DEBUG
 
+static float convert_pitch_delta_to_non_linear_space(
+    const float current_yaw,
+    const float current_pitch_non_lin,
+    const float pitch_delta,
+    const float yaw_delta
+) {
+    // Convert to linear space.  See `physics_make_orient`.
+    const rf::Vector3 fvec =
+        fw_vector_from_non_linear_yaw_pitch(current_yaw, current_pitch_non_lin);
+    const float current_pitch_lin = linear_pitch_from_forward_vector(fvec);
+
+    // Calculate in linear space.
+    constexpr float HALF_PI = 1.5707964f;
+    const float new_pitch_lin =
+        std::clamp(current_pitch_lin + pitch_delta, -HALF_PI, HALF_PI);
+    const float new_yaw = current_yaw + yaw_delta;
+
+    // Convert back to non-linear space.
+    const rf::Vector3 fvec_new =
+        fw_vector_from_linear_yaw_pitch(new_yaw, new_pitch_lin);
+    const float new_pitch_non_lin = non_linear_pitch_from_fw_vector(fvec_new);
+
+    // Update non-linear pitch delta.
+    const float new_pitch_delta = new_pitch_non_lin - current_pitch_non_lin;
+    xlog::trace(
+        "non-lin {} lin {} delta {} new {}",
+        current_pitch_non_lin,
+        current_pitch_lin,
+        pitch_delta,
+        new_pitch_delta
+    );
+
+    return new_pitch_delta;
+}
+
 CodeInjection linear_pitch_patch{
     0x0049DEC9,
-    [](auto& regs) {
-        if (!g_alpine_game_config.mouse_linear_pitch)
+    [] (const auto& regs) {
+        if (!g_alpine_game_config.mouse_linear_pitch) {
             return;
-        // Non-linear pitch value and delta from RF
-        rf::Entity* entity = regs.esi;
-        float current_yaw = entity->control_data.phb.y;
-        float current_pitch_non_lin = entity->control_data.eye_phb.x;
-        float& pitch_delta = *reinterpret_cast<float*>(regs.esp + 0x44 - 0x34);
-        float& yaw_delta = *reinterpret_cast<float*>(regs.esp + 0x44 + 0x4);
-        if (pitch_delta == 0)
+        }
+        float& pitch_delta = addr_as_ref<float>(regs.esp + 0x44 - 0x34);
+        if (pitch_delta == .0f) {
             return;
-        // Convert to linear space (see RotMatixFromEuler function at 004A0D70)
-        auto fvec = fw_vector_from_non_linear_yaw_pitch(current_yaw, current_pitch_non_lin);
-        float current_pitch_lin = linear_pitch_from_forward_vector(fvec);
-        // Calculate new pitch in linear space
-        float new_pitch_lin = current_pitch_lin + pitch_delta;
-        float new_yaw = current_yaw + yaw_delta;
-        // Clamp to [-pi, pi]
-        constexpr float half_pi = 1.5707964f;
-        new_pitch_lin = std::clamp(new_pitch_lin, -half_pi, half_pi);
-        // Convert back to non-linear space
-        auto fvec_new = fw_vector_from_linear_yaw_pitch(new_yaw, new_pitch_lin);
-        float new_pitch_non_lin = non_linear_pitch_from_fw_vector(fvec_new);
-        // Update non-linear pitch delta
-        float new_pitch_delta = new_pitch_non_lin - current_pitch_non_lin;
-        xlog::trace("non-lin {} lin {} delta {} new {}", current_pitch_non_lin, current_pitch_lin, pitch_delta,
-              new_pitch_delta);
-        pitch_delta = new_pitch_delta;
+        }
+        const rf::Entity* const entity = regs.esi;
+        const float current_yaw = entity->control_data.phb.y;
+        const float current_pitch_non_lin = entity->control_data.eye_phb.x;
+        const float yaw_delta = addr_as_ref<float>(regs.esp + 0x44 + 0x4);
+        pitch_delta = convert_pitch_delta_to_non_linear_space(
+            current_yaw,
+            current_pitch_non_lin,
+            pitch_delta,
+            yaw_delta
+        );
     },
 };
 

game_patch/misc/alpine_settings.cpp

@@ -953,15 +953,22 @@ bool alpine_player_settings_load(rf::Player* player)
     if (settings.count("MouseYInvert")) {
         player->settings.controls.axes[1].invert = std::stoi(settings["MouseYInvert"]);
         processed_keys.insert("MouseYInvert");
+    }
+     if (settings.count("SDLMouse")) {
+         g_alpine_game_config.sdl_mouse = std::stoi(settings["SDLMouse"]);
+         processed_keys.insert("SDLMouse");
+     } else if (settings.count("DirectInput")) {
+         // Legacy fallback: map DirectInput to the closest SDLMouse equivalent
+         // DirectInput == 0  -> SDLMouse = 0 (keep legacy / non-SDL behavior)
+         // DirectInput != 0  -> SDLMouse = 1 (use SDL-like backend)
+         int direct_input = std::stoi(settings["DirectInput"]);
+         g_alpine_game_config.sdl_mouse = (direct_input != 0) ? 1 : 0;
+         processed_keys.insert("DirectInput");
     }
     if (settings.count("MouseLinearPitch")) {
         g_alpine_game_config.mouse_linear_pitch = std::stoi(settings["MouseLinearPitch"]);
         processed_keys.insert("MouseLinearPitch");
     }
-    if (settings.count("SDLMouse")) {
-        g_alpine_game_config.sdl_mouse = std::stoi(settings["SDLMouse"]);
-        processed_keys.insert("SDLMouse");
-    }
     if (settings.count("SwapARBinds")) {
         g_alpine_game_config.swap_ar_controls = std::stoi(settings["SwapARBinds"]);
         processed_keys.insert("SwapARBinds");

game_patch/os/frametime.cpp

@@ -11,6 +11,7 @@
 #include "../rf/hud.h"
 #include "../rf/entity.h"
 #include "../rf/os/frametime.h"
+#include "os.h"
 #include "../multi/multi.h"
 #include "../main/main.h"
 #include "../misc/alpine_settings.h"

game_patch/os/os.cpp

@@ -12,6 +12,8 @@
 #include "../misc/alpine_settings.h"
 #include "win32_console.h"
 #include <xlog/xlog.h>
+#include <timeapi.h>
+#include "os.h"
 
 const char* get_win_msg_name(UINT msg);
 
@@ -145,6 +147,40 @@ static FunHook<void(char*, bool)> os_parse_params_hook{
     },
 };
 
+void wait_for(const float ms, const WaitableTimer& timer) {
+    if (ms <= .0f) {
+        return;
+    }
+
+    if (!timer.handle) {
+    SLEEP:
+        static const MMRESULT res = timeBeginPeriod(1);
+        if (res != TIMERR_NOERROR) {
+            ERR_ONCE(
+                "The frame rate may be unstable, because `timeBeginPeriod` failed ({})",
+                res
+            );
+        }
+        Sleep(static_cast<DWORD>(ms));
+    } else {
+        // SetWaitableTimer requires 100-nanosecond intervals.
+        // Negative values indicate relative time.
+        LARGE_INTEGER dur{
+            .QuadPart = -static_cast<LONGLONG>(static_cast<double>(ms) * 10'000.)
+        };
+
+        if (!SetWaitableTimer(timer.handle, &dur, 0, nullptr, nullptr, FALSE)) {
+            ERR_ONCE("`SetWaitableTimer` in `wait_for` failed ({})", GetLastError());
+            goto SLEEP;
+        }
+
+        if (WaitForSingleObject(timer.handle, INFINITE) != WAIT_OBJECT_0) {
+            ERR_ONCE("`WaitForSingleObject` in `wait_for` failed ({})", GetLastError());
+            goto SLEEP;
+        }
+    }
+}
+
 void os_apply_patch()
 {
     // Lock to DPI_AWARENESS_CONTEXT_UNAWARE so the legacy D3D renderer's bitmap-scaling