diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 629c38c69adc30a0a8feccfefddf376c6f462480..b84467fcc9c5052b997dce6079aab4098c585898 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
end;
end;
- if SDL_GetNumTouchDevices() > 0 then
+ if g_touch_enabled then
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsTouchMenu').GetControl('mOptionsControlsTouchMenu'));
+ g_touch_alt := TGUISwitch(menu.GetControl('swTouchAlt')).ItemIndex = 1;
g_touch_size := TGUIScroll(menu.GetControl('scTouchSize')).Value / 10 + 0.5;
g_touch_fire := TGUISwitch(menu.GetControl('swTouchFire')).ItemIndex = 1;
g_touch_offset := TGUIScroll(menu.GetControl('scTouchOffset')).Value * 5;
end;
end;
- if SDL_GetNumTouchDevices() > 0 then
+ if g_touch_enabled then
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsTouchMenu').GetControl('mOptionsControlsTouchMenu'));
+ with TGUISwitch(menu.GetControl('swTouchAlt')) do
+ if g_touch_alt then ItemIndex := 1 else ItemIndex := 0;
TGUIScroll(menu.GetControl('scTouchSize')).Value := Round((g_touch_size - 0.5) * 10);
with TGUISwitch(menu.GetControl('swTouchFire')) do
if g_touch_fire then ItemIndex := 1 else ItemIndex := 0;
menu: TGUIMenu;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsTouchMenu').GetControl('mOptionsControlsTouchMenu'));
+ g_touch_alt := TGUISwitch(menu.GetControl('swTouchAlt')).ItemIndex = 1;
g_touch_size := TGUIScroll(menu.GetControl('scTouchSize')).Value / 10 + 0.5;
g_touch_offset := TGUIScroll(menu.GetControl('scTouchOffset')).Value * 5;
end;
AddSpace();
AddButton(nil, _lc[I_MENU_CONTROL_JOYSTICKS], 'OptionsControlsJoystickMenu');
end;
- if SDL_GetNumTouchDevices() > 0 then
+ if g_touch_enabled then
begin
AddSpace();
AddButton(nil, _lc[I_MENU_CONTROL_TOUCH], 'OptionsControlsTouchMenu');
with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CONTROL_TOUCH]))) do
begin
Name := 'mOptionsControlsTouchMenu';
+ with AddSwitch(_lc[I_MENU_CONTROL_TOUCH_ALT]) do
+ begin
+ Name := 'swTouchAlt';
+ AddItem(_lc[I_MENU_NO]);
+ AddItem(_lc[I_MENU_YES]);
+ OnChange := ProcChangeTouchSettings;
+ end;
with AddScroll(_lc[I_MENU_CONTROL_TOUCH_SIZE]) do
begin
Name := 'scTouchSize';