diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 309764e3b36568716a31a96b76f855c82b8f8849..89b1a55acfd384e0fcf6e533c072090633e4ea01 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
with menu, gGameControls.P1Control do
begin
for i := 0 to 9 do
- KeyWeapon[i] := TGUIKeyRead(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key;
+ begin
+ KeyWeapon[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0;
+ KeyWeapon2[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1;
+ end;
end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP2Menu').GetControl('mOptionsControlsP2Menu'));
with menu, gGameControls.P2Control do
begin
for i := 0 to 9 do
- KeyWeapon[i] := TGUIKeyRead(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key;
+ begin
+ KeyWeapon[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0;
+ KeyWeapon2[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1;
+ end;
end;
if e_JoysticksAvailable > 0 then
TGUIKeyRead2(GetControl(_lc[I_MENU_CONTROL_STRAFE])).Key1 := KeyStrafe2;
end;
+ menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP1MenuWeapons').GetControl('mOptionsControlsP1MenuWeapons'));
+ with menu, gGameControls.P1Control do
+ begin
+ for i := 0 to 9 do
+ begin
+ TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0 := KeyWeapon[i];
+ TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1 := KeyWeapon2[i];
+ end;
+ end;
+
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP2Menu').GetControl('mOptionsControlsP2Menu'));
with menu, gGameControls.P2Control do
begin
TGUIKeyRead2(GetControl(_lc[I_MENU_CONTROL_STRAFE])).Key1 := KeyStrafe2;
end;
+ menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP2MenuWeapons').GetControl('mOptionsControlsP2MenuWeapons'));
+ with menu, gGameControls.P2Control do
+ begin
+ for i := 0 to 9 do
+ begin
+ TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0 := KeyWeapon[i];
+ TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1 := KeyWeapon2[i];
+ end;
+ end;
+
if e_JoysticksAvailable > 0 then
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsJoystickMenu').GetControl('mOptionsControlsJoystickMenu'));
begin
Name := 'mOptionsControlsP1MenuWeapons';
for i := 0 to 9 do
- AddKeyRead(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name :=
+ AddKeyRead2(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name :=
_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)];
end;
Menu.DefControl := 'mOptionsControlsP1MenuWeapons';
begin
Name := 'mOptionsControlsP2MenuWeapons';
for i := 0 to 9 do
- AddKeyRead(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name :=
+ AddKeyRead2(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name :=
_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)];
end;
Menu.DefControl := 'mOptionsControlsP2MenuWeapons';