From 24e10876ffa98584b38fbbf42087c6876a590e02 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Mon, 16 Mar 2026 04:36:30 +1100 Subject: [PATCH] Remove WinAPI primitive aliases from 4J.Input --- 4J.Input/4J_Input.cpp | 2 +- 4J.Input/4J_Input.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp index f66f90d27..def8bdc75 100644 --- a/4J.Input/4J_Input.cpp +++ b/4J.Input/4J_Input.cpp @@ -571,7 +571,7 @@ void C_4JInput::SetJoypadStickAxisMap(int, unsigned int, unsigned int) {} void C_4JInput::SetJoypadStickTriggerMap(int, unsigned int, unsigned int) {} void C_4JInput::SetKeyRepeatRate(float, float) {} void C_4JInput::SetDebugSequence(const char*, int (*)(void*), void*) {} -FLOAT C_4JInput::GetIdleSeconds(int) { return 0.f; } +float C_4JInput::GetIdleSeconds(int) { return 0.f; } bool C_4JInput::IsPadConnected(int iPad) { return iPad == 0; } // Silly check, we check if we have a keyboard. diff --git a/4J.Input/4J_Input.h b/4J.Input/4J_Input.h index 85ee8b5bd..cdaef7292 100644 --- a/4J.Input/4J_Input.h +++ b/4J.Input/4J_Input.h @@ -53,7 +53,7 @@ enum EKeyboardResult { }; typedef struct _STRING_VERIFY_RESPONSE { - WORD wNumStrings; + std::uint16_t wNumStrings; HRESULT* pStringResult; } STRING_VERIFY_RESPONSE; @@ -96,7 +96,7 @@ public: void SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs); void SetDebugSequence(const char* chSequenceA, int (*Func)(void*), void* lpParam); - FLOAT GetIdleSeconds(int iPad); + float GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); // In-Game values which may have been remapped due to Southpaw, swap