mirror of
https://github.com/GTAmodding/re3.git
synced 2024-11-15 11:49:00 +00:00
Merge branch 'master' into miami
# Conflicts: # src/core/Game.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/extras/postfx.h # src/extras/shaders/Makefile # src/render/Clouds.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Sprite2d.cpp
This commit is contained in:
commit
28dc67dc86
1 changed files with 10 additions and 0 deletions
|
@ -651,6 +651,11 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown(int32 button,
|
|||
}
|
||||
|
||||
AffectControllerStateOn_ButtonDown_AllStates(button, type, *state);
|
||||
|
||||
#ifdef REGISTER_START_BUTTON
|
||||
if (button == 12)
|
||||
state->Start = 255;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1060,6 +1065,11 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonUp(int32 button, eC
|
|||
{
|
||||
if (FrontEndMenuManager.GetIsMenuActive())
|
||||
AffectControllerStateOn_ButtonUp_All_Player_States(button, type, *state);
|
||||
|
||||
#ifdef REGISTER_START_BUTTON
|
||||
if (button == 12)
|
||||
state->Start = 0;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue