Merge pull request #383 from Nick007J/master

fixed build
This commit is contained in:
Nikolay Korolev 2020-04-06 19:46:52 +03:00 committed by GitHub
commit 3175f2ee48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1179,7 +1179,7 @@ CMenuManager::GetNumOptionsCntrlConfigScreens(void)
break; break;
case MENUPAGE_KEYBOARD_CONTROLS: case MENUPAGE_KEYBOARD_CONTROLS:
switch (m_ControlMethod) { switch (m_ControlMethod) {
case CONTROL_STANDART: case CONTROL_STANDARD:
number = 25; number = 25;
break; break;
case CONTROL_CLASSIC: case CONTROL_CLASSIC:
@ -1200,7 +1200,7 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
int bindingMargin = MENU_X(3.0f); int bindingMargin = MENU_X(3.0f);
float rowHeight; float rowHeight;
switch (CMenuManager::m_ControlMethod) { switch (CMenuManager::m_ControlMethod) {
case CONTROL_STANDART: case CONTROL_STANDARD:
rowHeight = 10.7f; rowHeight = 10.7f;
break; break;
case CONTROL_CLASSIC: case CONTROL_CLASSIC:
@ -1274,13 +1274,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
controllerAction = PED_LOOKBEHIND; controllerAction = PED_LOOKBEHIND;
break; break;
case 23: case 23:
if (CMenuManager::m_ControlMethod == CONTROL_STANDART) if (CMenuManager::m_ControlMethod == CONTROL_STANDARD)
controllerAction = -1; controllerAction = -1;
else else
controllerAction = PED_1RST_PERSON_LOOK_LEFT; controllerAction = PED_1RST_PERSON_LOOK_LEFT;
break; break;
case 24: case 24:
if (CMenuManager::m_ControlMethod == CONTROL_STANDART) if (CMenuManager::m_ControlMethod == CONTROL_STANDARD)
controllerAction = -1; controllerAction = -1;
else else
controllerAction = PED_1RST_PERSON_LOOK_RIGHT; controllerAction = PED_1RST_PERSON_LOOK_RIGHT;