mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-08 12:34:33 +00:00
Code Issues Releases Wiki Activity

Remove SDL_VERSION_ATLEAST references

Browse source
This commit is contained in:
Andrew Lanzone 2025-07-12 14:17:23 -07:00
parent 3600a5c716
commit 622cbd5288
1 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/openmw/mwinput/controllermanager.cpp
View file

@ -467,29 +467,20 @@ namespace MWInput
int ControllerManager::getControllerType()
{
int type = 0;
#if SDL_VERSION_ATLEAST(2, 0, 12)
SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
if (cntrl)
type = SDL_GameControllerGetType(cntrl);
#endif
return type;
return SDL_GameControllerGetType(cntrl);
return 0;
}
std::string ControllerManager::getControllerButtonIcon(int button)
{
int controllerType = ControllerManager::getControllerType();
bool isXbox = false;
bool isPsx = false;
bool isSwitch = false;
#if SDL_VERSION_ATLEAST(2, 0, 12)
isXbox = controllerType == SDL_CONTROLLER_TYPE_XBOX360 || controllerType == SDL_CONTROLLER_TYPE_XBOXONE;
isPsx = controllerType == SDL_CONTROLLER_TYPE_PS3 || controllerType == SDL_CONTROLLER_TYPE_PS4
|| controllerType == SDL_CONTROLLER_TYPE_PS5;
isSwitch = controllerType == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO;
#endif
bool isXbox = controllerType == SDL_CONTROLLER_TYPE_XBOX360 || controllerType == SDL_CONTROLLER_TYPE_XBOXONE;
bool isPsx = controllerType == SDL_CONTROLLER_TYPE_PS3 || controllerType == SDL_CONTROLLER_TYPE_PS4
|| controllerType == SDL_CONTROLLER_TYPE_PS5;;
bool isSwitch = controllerType == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO;
switch (button)
{
@ -546,13 +537,8 @@ namespace MWInput
{
int controllerType = ControllerManager::getControllerType();
bool isXbox = false;
bool isSwitch = false;
#if SDL_VERSION_ATLEAST(2, 0, 12)
isXbox = controllerType == SDL_CONTROLLER_TYPE_XBOX360 || controllerType == SDL_CONTROLLER_TYPE_XBOXONE;
isSwitch = controllerType == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO;
#endif
bool isXbox = controllerType == SDL_CONTROLLER_TYPE_XBOX360 || controllerType == SDL_CONTROLLER_TYPE_XBOXONE;
bool isSwitch = controllerType == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO;
switch (axis)
{