Merge remote-tracking branch 'refs/remotes/origin/main' into unhackify-widescreen

# Conflicts:
#	src/m_Do/m_Do_main.cpp

include/d/actor/d_a_alink.h

@@ -4551,7 +4551,7 @@ public:
 #if TARGET_PC
     void handleWolfHowl();
     void handleQuickTransform();
-    bool checkGyroAimItemContext();
+    bool checkGyroAimContext();
 #endif
 };  // Size: 0x385C
 

include/d/d_menu_ring.h

@@ -204,6 +204,9 @@ private:
     /* 0x6D1 */ u8 field_0x6d1;
     /* 0x6D2 */ u8 field_0x6d2;
     /* 0x6D3 */ u8 field_0x6d3;
+#if TARGET_PC
+    f32 mSelectItemSlideElapsed[4];
+#endif
 };
 
 #endif /* D_MENU_D_MENU_RING_H */

include/dusk/frame_interpolation.h

@@ -19,14 +19,12 @@ void end_record();
 void interpolate(float step);
 float get_interpolation_step();
 
-void notify_presentation_frame();
 void request_presentation_sync();
 bool presentation_sync_active();
 
-void notify_sim_tick_complete();
-uint32_t begin_presentation_ui_pass();
-uint32_t get_presentation_ui_advance_ticks();
-void end_presentation_ui_pass();
+// TODO: These should be phased out as UI is progressively updated to use game_clock
+void set_ui_tick_pending(bool value);
+bool get_ui_tick_pending();
 
 void open_child(const void* key, int32_t id);
 void close_child();

include/dusk/game_clock.h

@@ -0,0 +1,32 @@
+#ifndef DUSK_GAME_CLOCK_H
+#define DUSK_GAME_CLOCK_H
+
+#include <stddef.h>
+
+namespace dusk {
+namespace game_clock {
+
+void ensure_initialized();
+void reset_accumulator();
+
+constexpr float sim_pace() { return 1.0f / 30.0f; }
+constexpr float period_for_original_frames(float frame_count) { return frame_count * sim_pace(); }
+constexpr float ui_maximum_dt() { return 0.05f; }
+constexpr float ui_initial_dt() { return 1.0f / 60.0f; }
+
+struct MainLoopPacer {
+    float presentation_dt_seconds;
+    bool is_interpolating;
+    bool do_sim_tick;
+    float interpolation_step;
+    float sim_pace;
+};
+
+MainLoopPacer advance_main_loop();
+
+float consume_interval(const void* consumer);
+
+}  // namespace game_clock
+}  // namespace dusk
+
+#endif  // DUSK_GAME_CLOCK_H

include/dusk/gyro.h

@@ -4,7 +4,7 @@
 namespace dusk::gyro {
 void read(float dt);
 void getAimDeltas(float& out_yaw, float& out_pitch);
-bool queryGyroAimItemContext();
+bool queryGyroAimContext();
 
 void rollgoalTick(bool play_active, s16 camera_yaw);
 void rollgoalTableOffset(s16& out_ax, s16& out_az);

include/dusk/scope_guard.hpp

@@ -0,0 +1,20 @@
+#ifndef DUSK_SCOPE_GUARD_HPP
+#define DUSK_SCOPE_GUARD_HPP
+
+#include <functional>
+
+class SimpleScopeGuard {
+public:
+    // Store the function in the constructor
+    explicit SimpleScopeGuard(const std::function<void()>& func) : m_func(func) {}
+
+    // Run the function when the object goes out of scope
+    ~SimpleScopeGuard() {
+        if (m_func) m_func();
+    }
+
+private:
+    std::function<void()> m_func;
+};
+
+#endif //DUSK_SCOPE_GUARD_HPP

include/dusk/settings.h

@@ -61,6 +61,7 @@ struct UserSettings {
         ConfigVar<bool> noMissClimbing;
         ConfigVar<bool> fastTears;
         ConfigVar<bool> instantSaves;
+        ConfigVar<bool> instantText;
         ConfigVar<bool> sunsSong;
 
         // Preferences