X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=3ffef2697e07622dbaceb277f30d1c8036471315;hb=0e101bd452c40da601236aaa2dd4106be47ddce1;hp=9aa5b5604d5f4611a6b7fb2783058a4c3a416b82;hpb=64fbecdc737068832ad95c2b461fad5c81ce7732;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 9aa5b56..3ffef26 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,11 +45,11 @@ uses
   {$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,
+  e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
   MAPDEF, Math, g_saveload,
   e_texture, g_language,
   g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
-  utils, wadreader;
+  utils, wadreader, g_system;
 
 
 type TYNCallback = procedure (yes:Boolean);
@@ -119,7 +118,8 @@ begin
 
   ovs := gVSync;
   gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
-  if (ovs <> gVSync) then g_SetVSync(gVSync);
+  if (ovs <> gVSync) then
+    sys_EnableVSync(gVSync);
 
   gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
   glLegacyNPOT := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
@@ -161,7 +161,8 @@ begin
   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;
+  gPlayerIndicator := TGUISwitch(menu.GetControl('swPlayerIndicator')).ItemIndex;
+  gPlayerIndicatorStyle := TGUISwitch(menu.GetControl('swPlayerIndicatorStyle')).ItemIndex;
   if TGUIScroll(menu.GetControl('scScaleFactor')).Value <> TempScale then
   begin
     TempScale := TGUIScroll(menu.GetControl('scScaleFactor')).Value;
@@ -570,7 +571,10 @@ begin
     ItemIndex := gChatBubble;
 
   with TGUISwitch(menu.GetControl('swPlayerIndicator')) do
-    if gPlayerIndicator then ItemIndex := 0 else ItemIndex := 1;
+    ItemIndex := gPlayerIndicator;
+
+  with TGUISwitch(menu.GetControl('swPlayerIndicatorStyle')) do
+    ItemIndex := gPlayerIndicatorStyle;
 
   TempScale := Round(g_dbg_scale - 1);
   TGUIScroll(menu.GetControl('scScaleFactor')).Value := TempScale;
@@ -815,7 +819,7 @@ begin
   slWaitStr := _lc[I_NET_SLIST_WAIT];
 
   g_Game_Draw;
-  ReDrawWindow;
+  sys_Repaint;
 
   slReturnPressed := True;
   if g_Net_Slist_Fetch(slCurrent) then
@@ -1821,7 +1825,6 @@ procedure ProcVideoOptionsRes();
 var
   menu: TGUIMenu;
   list: SSArray;
-  SR: DWORD;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
 
@@ -1832,15 +1835,16 @@ begin
 
   with TGUIListBox(menu.GetControl('lsResolution')) do
   begin
-    list := GetDisplayModes(gBPP, SR);
-
+    list := sys_GetDispalyModes(gBPP);
     if list <> nil then
-      begin
-        Items := list;
-        ItemIndex := SR;
-      end
+    begin
+      Items := list;
+      ItemIndex := Length(list)
+    end
     else
-      Clear();
+    begin
+      Clear
+    end
   end;
 
   with TGUISwitch(menu.GetControl('swFullScreen')) do
@@ -2781,8 +2785,15 @@ begin
     with AddSwitch(_lc[I_MENU_GAME_PLAYER_INDICATOR]) do
     begin
       Name := 'swPlayerIndicator';
-      AddItem(_lc[I_MENU_YES]);
-      AddItem(_lc[I_MENU_NO]);
+      AddItem(_lc[I_MENU_GAME_INDICATOR_NONE]);
+      AddItem(_lc[I_MENU_GAME_INDICATOR_OWN]);
+      AddItem(_lc[I_MENU_GAME_INDICATOR_ALL]);
+    end;
+    with AddSwitch(_lc[I_MENU_GAME_INDICATOR_STYLE]) do
+    begin
+      Name := 'swPlayerIndicatorStyle';
+      AddItem(_lc[I_MENU_GAME_INDICATOR_ARROW]);
+      AddItem(_lc[I_MENU_GAME_INDICATOR_NAME]);
     end;
     with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
     begin