Shifts the tools messageboxes to be distinct from any messageboxes in the main game

Reorged the canvas handling of gamepad inputs for the axis and triggers to use the SI_ versions in the right spots
Fixed issue where pause menu would be hidden and not display again
Made the pause menu active from the gamepad start button rather than back
This commit is contained in:
Areloch 2020-07-24 00:40:03 -05:00
parent ef4cc8b573
commit 5b289bce5e
57 changed files with 217 additions and 217 deletions

View file

@ -1075,14 +1075,12 @@ bool GuiCanvas::processGamepadEvent(InputEventInfo &inputEvent)
switch (inputEvent.objInst)
{
case XI_LEFT_TRIGGER:
case XI_RIGHT_TRIGGER:
case SI_ZAXIS:
case SI_RZAXIS:
return mFirstResponder->onGamepadTrigger(mLastEvent);
case SI_ZAXIS:
case SI_YAXIS:
case XI_THUMBLY:
case XI_THUMBRY:
case SI_RYAXIS:
if (!negative)
{
return mFirstResponder->onGamepadAxisDown(mLastEvent);
@ -1093,8 +1091,7 @@ bool GuiCanvas::processGamepadEvent(InputEventInfo &inputEvent)
}
case SI_XAXIS:
case XI_THUMBLX:
case XI_THUMBRX:
case SI_RXAXIS:
default:
if (negative)
{