Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #138 from Laupetin/feature/ps3hud

Browse Source 
Add Playstation style flavor to gamepad buttons
This commit is contained in:
Louve 2021-11-08 19:12:48 +01:00 committed by GitHub
commit 6a20962f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/Components/Modules/Gamepad.cpp
View File

@ -108,7 +108,7 @@ namespace Components
{"DPAD_RIGHT", Game::K_DPAD_RIGHT}, {"DPAD_RIGHT", Game::K_DPAD_RIGHT},
}; };
Game::keyname_t Gamepad::extendedLocalizedKeyNames[] Game::keyname_t Gamepad::extendedLocalizedKeyNamesXenon[]
{ {
// Material text icons pattern: 0x01 width height material_name_len // Material text icons pattern: 0x01 width height material_name_len
{"^\x01\x32\x32\x08""button_a", Game::K_BUTTON_A}, {"^\x01\x32\x32\x08""button_a", Game::K_BUTTON_A},
@ -128,8 +128,30 @@ namespace Components
{"^\x01\x32\x32\x09""dpad_left", Game::K_DPAD_LEFT}, {"^\x01\x32\x32\x09""dpad_left", Game::K_DPAD_LEFT},
{"^\x01\x32\x32\x0A""dpad_right", Game::K_DPAD_RIGHT}, {"^\x01\x32\x32\x0A""dpad_right", Game::K_DPAD_RIGHT},
}; };
Game::keyname_t Gamepad::extendedLocalizedKeyNamesPs3[]
{
// Material text icons pattern: 0x01 width height material_name_len
{"^\x01\x32\x32\x10""button_ps3_cross", Game::K_BUTTON_A},
{"^\x01\x32\x32\x11""button_ps3_circle", Game::K_BUTTON_B},
{"^\x01\x32\x32\x11""button_ps3_square", Game::K_BUTTON_X},
{"^\x01\x32\x32\x13""button_ps3_triangle", Game::K_BUTTON_Y},
{"^\x01\x32\x32\x0D""button_ps3_l1", Game::K_BUTTON_LSHLDR},
{"^\x01\x32\x32\x0D""button_ps3_r1", Game::K_BUTTON_RSHLDR},
{"^\x01\x32\x32\x10""button_ps3_start", Game::K_BUTTON_START},
{"^\x01\x32\x32\x0F""button_ps3_back", Game::K_BUTTON_BACK},
{"^\x01\x48\x32\x0D""button_ps3_l3", Game::K_BUTTON_LSTICK},
{"^\x01\x48\x32\x0D""button_ps3_r3", Game::K_BUTTON_RSTICK},
{"^\x01\x32\x32\x0D""button_ps3_l2", Game::K_BUTTON_LTRIG},
{"^\x01\x32\x32\x0D""button_ps3_r2", Game::K_BUTTON_RTRIG},
{"^\x01\x32\x32\x0B""dpad_ps3_up", Game::K_DPAD_UP},
{"^\x01\x32\x32\x0D""dpad_ps3_down", Game::K_DPAD_DOWN},
{"^\x01\x32\x32\x0D""dpad_ps3_left", Game::K_DPAD_LEFT},
{"^\x01\x32\x32\x0E""dpad_ps3_right", Game::K_DPAD_RIGHT},
};
Game::keyname_t Gamepad::combinedKeyNames[Game::KEY_NAME_COUNT + std::extent_v<decltype(extendedKeyNames)> + 1]; Game::keyname_t Gamepad::combinedKeyNames[Game::KEY_NAME_COUNT + std::extent_v<decltype(extendedKeyNames)> + 1];
Game::keyname_t Gamepad::combinedLocalizedKeyNames[Game::KEY_NAME_COUNT + std::extent_v<decltype(extendedLocalizedKeyNames)> + 1]; Game::keyname_t Gamepad::combinedLocalizedKeyNamesXenon[Game::KEY_NAME_COUNT + std::extent_v<decltype(extendedLocalizedKeyNamesXenon)> + 1];
Game::keyname_t Gamepad::combinedLocalizedKeyNamesPs3[Game::KEY_NAME_COUNT + std::extent_v<decltype(extendedLocalizedKeyNamesPs3)> + 1];
Gamepad::ControllerMenuKeyMapping Gamepad::controllerMenuKeyMappings[] Gamepad::ControllerMenuKeyMapping Gamepad::controllerMenuKeyMappings[]
{ {
@ -155,6 +177,7 @@ namespace Components
Dvar::Var Gamepad::gpad_debug; Dvar::Var Gamepad::gpad_debug;
Dvar::Var Gamepad::gpad_present; Dvar::Var Gamepad::gpad_present;
Dvar::Var Gamepad::gpad_in_use; Dvar::Var Gamepad::gpad_in_use;
Dvar::Var Gamepad::gpad_style;
Dvar::Var Gamepad::gpad_sticksConfig; Dvar::Var Gamepad::gpad_sticksConfig;
Dvar::Var Gamepad::gpad_buttonConfig; Dvar::Var Gamepad::gpad_buttonConfig;
Dvar::Var Gamepad::gpad_menu_scroll_delay_first; Dvar::Var Gamepad::gpad_menu_scroll_delay_first;
@ -1694,6 +1717,7 @@ namespace Components
gpad_debug = Dvar::Register<bool>("gpad_debug", false, Game::DVAR_FLAG_NONE, "Game pad debugging"); gpad_debug = Dvar::Register<bool>("gpad_debug", false, Game::DVAR_FLAG_NONE, "Game pad debugging");
gpad_present = Dvar::Register<bool>("gpad_present", false, Game::DVAR_FLAG_NONE, "Game pad present"); gpad_present = Dvar::Register<bool>("gpad_present", false, Game::DVAR_FLAG_NONE, "Game pad present");
gpad_in_use = Dvar::Register<bool>("gpad_in_use", false, Game::DVAR_FLAG_NONE, "A game pad is in use"); gpad_in_use = Dvar::Register<bool>("gpad_in_use", false, Game::DVAR_FLAG_NONE, "A game pad is in use");
gpad_style = Dvar::Register<bool>("gpad_style", false, Game::DVAR_FLAG_SAVED, "Switch between Xbox and PS HUD");
gpad_sticksConfig = Dvar::Register<const char*>("gpad_sticksConfig", "", Game::DVAR_FLAG_SAVED, "Game pad stick configuration"); gpad_sticksConfig = Dvar::Register<const char*>("gpad_sticksConfig", "", Game::DVAR_FLAG_SAVED, "Game pad stick configuration");
gpad_buttonConfig = Dvar::Register<const char*>("gpad_buttonConfig", "", Game::DVAR_FLAG_SAVED, "Game pad button configuration"); gpad_buttonConfig = Dvar::Register<const char*>("gpad_buttonConfig", "", Game::DVAR_FLAG_SAVED, "Game pad button configuration");
gpad_menu_scroll_delay_first = Dvar::Register<int>("gpad_menu_scroll_delay_first", 420, 0, 1000, Game::DVAR_FLAG_SAVED, "Menu scroll key-repeat delay, for the first repeat, in milliseconds"); gpad_menu_scroll_delay_first = Dvar::Register<int>("gpad_menu_scroll_delay_first", 420, 0, 1000, Game::DVAR_FLAG_SAVED, "Menu scroll key-repeat delay, for the first repeat, in milliseconds");
@ -1830,21 +1854,53 @@ namespace Components
return cl_bypassMouseInput.get<bool>() || IsGamePadInUse(); return cl_bypassMouseInput.get<bool>() || IsGamePadInUse();
} }
Game::keyname_t* Gamepad::GetLocalizedKeyNameMap()
{
if(gpad_style.get<bool>())
return combinedLocalizedKeyNamesPs3;
return combinedLocalizedKeyNamesXenon;
}
void __declspec(naked) Gamepad::GetLocalizedKeyName_Stub()
{
__asm
{
push eax
pushad
call GetLocalizedKeyNameMap
mov [esp + 0x20], eax
popad
pop eax
// Re-execute last instruction from game to set flags again for upcoming jump
test edi, edi
ret
}
}
void Gamepad::CreateKeyNameMap() void Gamepad::CreateKeyNameMap()
{ {
memcpy(combinedKeyNames, Game::keyNames, sizeof(Game::keyname_t) * Game::KEY_NAME_COUNT); memcpy(combinedKeyNames, Game::keyNames, sizeof(Game::keyname_t) * Game::KEY_NAME_COUNT);
memcpy(&combinedKeyNames[Game::KEY_NAME_COUNT], extendedKeyNames, sizeof(Game::keyname_t) * std::extent_v<decltype(extendedKeyNames)>); memcpy(&combinedKeyNames[Game::KEY_NAME_COUNT], extendedKeyNames, sizeof(Game::keyname_t) * std::extent_v<decltype(extendedKeyNames)>);
combinedKeyNames[std::extent_v<decltype(combinedKeyNames)> - 1] = {nullptr, 0}; combinedKeyNames[std::extent_v<decltype(combinedKeyNames)> - 1] = {nullptr, 0};
memcpy(combinedLocalizedKeyNames, Game::localizedKeyNames, sizeof(Game::keyname_t) * Game::LOCALIZED_KEY_NAME_COUNT); memcpy(combinedLocalizedKeyNamesXenon, Game::localizedKeyNames, sizeof(Game::keyname_t) * Game::LOCALIZED_KEY_NAME_COUNT);
memcpy(&combinedLocalizedKeyNames[Game::LOCALIZED_KEY_NAME_COUNT], extendedLocalizedKeyNames, memcpy(&combinedLocalizedKeyNamesXenon[Game::LOCALIZED_KEY_NAME_COUNT], extendedLocalizedKeyNamesXenon,
sizeof(Game::keyname_t) * std::extent_v<decltype(extendedLocalizedKeyNames)>); sizeof(Game::keyname_t) * std::extent_v<decltype(extendedLocalizedKeyNamesXenon)>);
combinedLocalizedKeyNames[std::extent_v<decltype(combinedLocalizedKeyNames)> - 1] = {nullptr, 0}; combinedLocalizedKeyNamesXenon[std::extent_v<decltype(combinedLocalizedKeyNamesXenon)> - 1] = {nullptr, 0};
memcpy(combinedLocalizedKeyNamesPs3, Game::localizedKeyNames, sizeof(Game::keyname_t) * Game::LOCALIZED_KEY_NAME_COUNT);
memcpy(&combinedLocalizedKeyNamesPs3[Game::LOCALIZED_KEY_NAME_COUNT], extendedLocalizedKeyNamesPs3,
sizeof(Game::keyname_t) * std::extent_v<decltype(extendedLocalizedKeyNamesPs3)>);
combinedLocalizedKeyNamesPs3[std::extent_v<decltype(combinedLocalizedKeyNamesPs3)> - 1] = {nullptr, 0};
Utils::Hook::Set<Game::keyname_t*>(0x4A780A, combinedKeyNames); Utils::Hook::Set<Game::keyname_t*>(0x4A780A, combinedKeyNames);
Utils::Hook::Set<Game::keyname_t*>(0x4A7810, combinedKeyNames); Utils::Hook::Set<Game::keyname_t*>(0x4A7810, combinedKeyNames);
Utils::Hook::Set<Game::keyname_t*>(0x435C9F, combinedKeyNames); Utils::Hook::Set<Game::keyname_t*>(0x435C9F, combinedKeyNames);
Utils::Hook::Set<Game::keyname_t*>(0x435C98, combinedLocalizedKeyNames); Utils::Hook(0x435C97, GetLocalizedKeyName_Stub, HOOK_CALL).install()->quick();
} }
Gamepad::Gamepad() Gamepad::Gamepad()

10
src/Components/Modules/Gamepad.hpp
View File

@ -51,9 +51,11 @@ namespace Components
static const char* gamePadMappingTypeNames[]; static const char* gamePadMappingTypeNames[];
static Game::keyNum_t menuScrollButtonList[]; static Game::keyNum_t menuScrollButtonList[];
static Game::keyname_t extendedKeyNames[]; static Game::keyname_t extendedKeyNames[];
static Game::keyname_t extendedLocalizedKeyNames[]; static Game::keyname_t extendedLocalizedKeyNamesXenon[];
static Game::keyname_t extendedLocalizedKeyNamesPs3[];
static Game::keyname_t combinedKeyNames[]; static Game::keyname_t combinedKeyNames[];
static Game::keyname_t combinedLocalizedKeyNames[]; static Game::keyname_t combinedLocalizedKeyNamesXenon[];
static Game::keyname_t combinedLocalizedKeyNamesPs3[];
static ControllerMenuKeyMapping controllerMenuKeyMappings[]; static ControllerMenuKeyMapping controllerMenuKeyMappings[];
static GamePad gamePads[Game::MAX_GAMEPADS]; static GamePad gamePads[Game::MAX_GAMEPADS];
@ -65,6 +67,7 @@ namespace Components
static Dvar::Var gpad_debug; static Dvar::Var gpad_debug;
static Dvar::Var gpad_present; static Dvar::Var gpad_present;
static Dvar::Var gpad_in_use; static Dvar::Var gpad_in_use;
static Dvar::Var gpad_style;
static Dvar::Var gpad_sticksConfig; static Dvar::Var gpad_sticksConfig;
static Dvar::Var gpad_buttonConfig; static Dvar::Var gpad_buttonConfig;
static Dvar::Var gpad_menu_scroll_delay_first; static Dvar::Var gpad_menu_scroll_delay_first;
@ -192,6 +195,9 @@ namespace Components
static void CL_KeyEvent_Hk(int localClientNum, int key, int down, unsigned int time); static void CL_KeyEvent_Hk(int localClientNum, int key, int down, unsigned int time);
static int CL_MouseEvent_Hk(int x, int y, int dx, int dy); static int CL_MouseEvent_Hk(int x, int y, int dx, int dy);
static bool UI_RefreshViewport_Hk(); static bool UI_RefreshViewport_Hk();
static Game::keyname_t* GetLocalizedKeyNameMap();
static void GetLocalizedKeyName_Stub();
static void CreateKeyNameMap(); static void CreateKeyNameMap();
}; };
} }

1
src/Components/Modules/Localization.cpp
View File

@ -181,6 +181,7 @@ namespace Components
"a231", "a231",
"AmateurHailbut", "AmateurHailbut",
"Aoki", "Aoki",
"Chase",
"civil", "civil",
"Dasfonia", "Dasfonia",
"Deity", "Deity",