From df0d78f371a10177854058e5431f8d938a88f297 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 2 Aug 2017 21:42:57 +0300 Subject: [PATCH] fixed player menu titles --- src/game/g_language.pas | 10 ++++++++-- src/game/g_menu.pas | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/game/g_language.pas b/src/game/g_language.pas index 5f73c2d..a9049a6 100644 --- a/src/game/g_language.pas +++ b/src/game/g_language.pas @@ -194,6 +194,8 @@ type I_MENU_LOADING, I_MENU_PLAYER_1, I_MENU_PLAYER_2, + I_MENU_PLAYER_1_KBD, + I_MENU_PLAYER_2_KBD, I_MENU_PLAYER_1_ALT, I_MENU_PLAYER_2_ALT, I_MENU_PLAYER_1_WEAPONS, @@ -946,9 +948,13 @@ const 'Îñòàëîñü %d ñåêóíä äî ñëåäóþùåãî ðàóíäà'), ('MENU LOADING', 'Loading...', 'Çàãðóçêà...'), - ('MENU PLAYER 1', 'Player 1 KEYBOARD', + ('MENU PLAYER 1', 'Player 1', + 'Ïåðâûé èãðîê'), + ('MENU PLAYER 2', 'Player 2', + 'Âòîðîé èãðîê'), + ('MENU PLAYER 1 KBD', 'Player 1, keyboard', 'Ïåðâûé èãðîê, êëàâèàòóðà'), - ('MENU PLAYER 2', 'Player 2 KEYBOARD', + ('MENU PLAYER 2 KBD', 'Player 2, keyboard', 'Âòîðîé èãðîê, êëàâèàòóðà'), ('MENU PLAYER 1 ALT', 'Player 1, GAMEPAD', 'Ïåðâûé èãðîê, GAMEPAD'), diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas index 2f216ff..678c0a0 100644 --- a/src/game/g_menu.pas +++ b/src/game/g_menu.pas @@ -2614,10 +2614,10 @@ begin AddKeyRead(_lc[I_MENU_CONTROL_CHAT]).Name := _lc[I_MENU_CONTROL_CHAT]; AddKeyRead(_lc[I_MENU_CONTROL_TEAMCHAT]).Name := _lc[I_MENU_CONTROL_TEAMCHAT]; AddSpace(); - AddButton(nil, _lc[I_MENU_PLAYER_1], 'OptionsControlsP1Menu'); + AddButton(nil, _lc[I_MENU_PLAYER_1_KBD], 'OptionsControlsP1Menu'); AddButton(nil, _lc[I_MENU_PLAYER_1_ALT], 'OptionsControlsP1MenuAlt'); AddButton(nil, _lc[I_MENU_PLAYER_1_WEAPONS], 'OptionsControlsP1MenuWeapons'); - AddButton(nil, _lc[I_MENU_PLAYER_2], 'OptionsControlsP2Menu'); + AddButton(nil, _lc[I_MENU_PLAYER_2_KBD], 'OptionsControlsP2Menu'); AddButton(nil, _lc[I_MENU_PLAYER_2_ALT], 'OptionsControlsP2MenuAlt'); AddButton(nil, _lc[I_MENU_PLAYER_2_WEAPONS], 'OptionsControlsP2MenuWeapons'); AddSpace(); @@ -2628,7 +2628,7 @@ begin g_GUI_AddWindow(Menu); Menu := TGUIWindow.Create('OptionsControlsP1Menu'); - with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_1]))) do + with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_1_KBD]))) do begin Name := 'mOptionsControlsP1Menu'; AddKeyRead(_lc[I_MENU_CONTROL_LEFT]).Name := _lc[I_MENU_CONTROL_LEFT]; @@ -2674,7 +2674,7 @@ begin g_GUI_AddWindow(Menu); Menu := TGUIWindow.Create('OptionsControlsP2Menu'); - with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_2]))) do + with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_2_KBD]))) do begin Name := 'mOptionsControlsP2Menu'; AddKeyRead(_lc[I_MENU_CONTROL_LEFT]).Name := _lc[I_MENU_CONTROL_LEFT]; -- 2.29.2