|
|
@ -353,7 +353,7 @@ bool AiL::OnUserUpdate(float fElapsedTime){ |
|
|
|
Input::ingameControlsHandle=SteamInput()->GetActionSetHandle("InGameControls"); |
|
|
|
Input::ingameControlsHandle=SteamInput()->GetActionSetHandle("InGameControls"); |
|
|
|
Input::menuControlsHandle=SteamInput()->GetActionSetHandle("MenuControls"); |
|
|
|
Input::menuControlsHandle=SteamInput()->GetActionSetHandle("MenuControls"); |
|
|
|
} |
|
|
|
} |
|
|
|
SteamInput()->ActivateActionSet(STEAM_INPUT_HANDLE_ALL_CONTROLLERS,Input::menuControlsHandle); |
|
|
|
ActivateActionSetForAllControllers(Input::menuControlsHandle); |
|
|
|
Input::UpdateSteamInput(); |
|
|
|
Input::UpdateSteamInput(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -434,7 +434,7 @@ bool AiL::DownPressed(){ |
|
|
|
|
|
|
|
|
|
|
|
void AiL::HandleUserInput(float fElapsedTime){ |
|
|
|
void AiL::HandleUserInput(float fElapsedTime){ |
|
|
|
if(!Menu::stack.empty())return; //A window being opened means there's no user input allowed.
|
|
|
|
if(!Menu::stack.empty())return; //A window being opened means there's no user input allowed.
|
|
|
|
if(SteamInput())SteamInput()->ActivateActionSet(STEAM_INPUT_HANDLE_ALL_CONTROLLERS,Input::ingameControlsHandle); |
|
|
|
if(SteamInput())ActivateActionSetForAllControllers(Input::ingameControlsHandle); |
|
|
|
|
|
|
|
|
|
|
|
if(GetKey(SCROLL).bPressed)displayHud=!displayHud; |
|
|
|
if(GetKey(SCROLL).bPressed)displayHud=!displayHud; |
|
|
|
|
|
|
|
|
|
|
@ -3797,3 +3797,9 @@ bool AiL::Steam_Init(){ |
|
|
|
} |
|
|
|
} |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void AiL::ActivateActionSetForAllControllers(InputActionSetHandle_t actionSetHandle){ |
|
|
|
|
|
|
|
for(int i=0;i<Input::controllerCount;i++){ |
|
|
|
|
|
|
|
SteamInput()->ActivateActionSet(Input::steamControllers[i],Input::menuControlsHandle); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |