mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-26 18:15:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# 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:
Sergeanur 2020-08-14 13:52:10 +03:00
parent 85d76dc171 2a0a508a10
commit 28dc67dc86
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/ControllerConfig.cpp
View file

@ -651,6 +651,11 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown(int32 button,
} }
AffectControllerStateOn_ButtonDown_AllStates(button, type, *state); 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()) if (FrontEndMenuManager.GetIsMenuActive())
AffectControllerStateOn_ButtonUp_All_Player_States(button, type, *state); AffectControllerStateOn_ButtonUp_All_Player_States(button, type, *state);
#ifdef REGISTER_START_BUTTON
if (button == 12)
state->Start = 0;
#endif
} }
} }
} }