Merge branch 'master' into master

This commit is contained in:
Fire_Head 2019-10-27 06:36:58 +03:00 committed by GitHub
commit 6a46cc6c3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 2873 additions and 327 deletions

View file

@ -1466,7 +1466,7 @@ void CMenuManager::Process(void)
else {
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
for (int i = 0; i < 4; i++)
ControlsManager.ClearSettingsAssociatedWithAction(m_CurrCntrlAction, i);
ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
field_534 = false;
m_bKeyChangeNotProcessed = false;
pControlEdit = nil;