diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp index bfd90803..c305eaf3 100644 --- a/Adventures in Lestoria/Key.cpp +++ b/Adventures in Lestoria/Key.cpp @@ -427,7 +427,7 @@ float Input::Analog(){ std::string Input::GetDisplayName()const{ if(type==STEAM){ - return std::format("STEAM:{}",key); + return std::format("{}",enumToActionName[activeSteamControllerIndex][Steam::SteamInput(key)].first); } if(!GenericKey::keyLiteral.count({type,key}))return ""; return GenericKey::keyLiteral.at({type,key}).displayName; @@ -1083,17 +1083,27 @@ const bool Input::AxesActive(){ void Input::StartVibration(const bool override){ if(!GameSettings::RumbleEnabled(override))return; if(UsingGamepad()){ - for(GamePad*gamepad:GamePad::getGamepads()){ - if(gamepad->stillConnected){ - gamepad->startVibration(); + if(SteamInput()){ + SteamInput()->TriggerVibration(steamControllers[activeSteamControllerIndex],std::numeric_limits::max(),std::numeric_limits::max()); + }else{ + for(GamePad*gamepad:GamePad::getGamepads()){ + if(gamepad->stillConnected){ + gamepad->startVibration(); + } } } } } void Input::StopVibration(){ - for(GamePad*gamepad:GamePad::getGamepads()){ - if(gamepad->stillConnected){ - gamepad->stopVibration(); + if(SteamInput()){ + for(int i=0;iTriggerVibration(steamControllers[i],0U,0U); + } + }else{ + for(GamePad*gamepad:GamePad::getGamepads()){ + if(gamepad->stillConnected){ + gamepad->stopVibration(); + } } } } diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 3f89b584..db57b87f 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -19,7 +19,7 @@ Remove Unlock All Button Sword attack should linger Add game file debug logging -Automatically pause if controller is disconnected (while using a controller) +Controller Vibration PS5 LED color support diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 395079c5..52657640 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_BUILD 8395 +#define VERSION_BUILD 8398 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 147df935..9d5e0513 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ