diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 629c38c69adc30a0a8feccfefddf376c6f462480..6265eeb2d69ce0abf6cbc5cb03d1f72523e3619a 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
implementation
uses
-{$IFDEF USE_NANOGL}
- nanoGL,
-{$ELSE}
- GL, GLExt,
-{$ENDIF}
+ {$INCLUDE ../nogl/noGLuses.inc}
g_gui, g_textures, e_graphics, g_main, g_window, g_game, g_map,
g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
e_log, SysUtils, CONFIG, g_playermodel, DateUtils, sdl2,
gShowMessages := TGUISwitch(menu.GetControl('swMessages')).ItemIndex = 0;
gRevertPlayers := TGUISwitch(menu.GetControl('swRevertPlayers')).ItemIndex = 0;
gChatBubble := TGUISwitch(menu.GetControl('swChatBubble')).ItemIndex;
+ gPlayerIndicator := TGUISwitch(menu.GetControl('swPlayerIndicator')).ItemIndex = 0;
g_dbg_scale := TGUIScroll(menu.GetControl('scScaleFactor')).Value + 1;
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsMenu').GetControl('mOptionsControlsMenu'));
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;
gPlayer2Settings.Color := Model.Color;
end;
- if gPlayer1Settings.Name = '' then gPlayer1Settings.Name := 'Player1';
- if gPlayer2Settings.Name = '' then gPlayer2Settings.Name := 'Player2';
+ if gPlayer1Settings.Name = '' then gPlayer1Settings.Name := GenPlayerName(1);
+ if gPlayer2Settings.Name = '' then gPlayer2Settings.Name := GenPlayerName(2);
if g_Game_IsServer then
begin
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;
with TGUISwitch(menu.GetControl('swChatBubble')) do
ItemIndex := gChatBubble;
+ with TGUISwitch(menu.GetControl('swPlayerIndicator')) do
+ if gPlayerIndicator then ItemIndex := 0 else ItemIndex := 1;
+
TGUIScroll(menu.GetControl('scScaleFactor')).Value := Round(g_dbg_scale - 1);
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mOptionsPlayersP1Menu'));
end
else
slWaitStr := _lc[I_NET_SLIST_ERROR];
+ g_Serverlist_GenerateTable(slCurrent, slTable);
end;
procedure ProcStartCampaign();
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;
AddItem(_lc[I_MENU_GAME_CHAT_TYPE_COLOR]);
AddItem(_lc[I_MENU_GAME_CHAT_TYPE_TEXTURE]);
end;
+ with AddSwitch(_lc[I_MENU_GAME_PLAYER_INDICATOR]) do
+ begin
+ Name := 'swPlayerIndicator';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ end;
with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
begin
Name := 'scScaleFactor';
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';