X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=c56d6e821bd6d7224387c6ae68a434b4b0b2cce9;hb=82fc44046c22d1b60695f3b1f7abfb48f18bea48;hp=b29a5137c4ff173c7e67b41bac7359d980736c76;hpb=be2ad7bf5e09b4ee91a0c5ee741503ace8c7887c;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index b29a513..c56d6e8 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -124,6 +124,7 @@ begin
 
   gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
   glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+  gLerpActors := TGUISwitch(menu.GetControl('swInterp')).ItemIndex = 0;
 
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
@@ -400,6 +401,9 @@ begin
   with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
     if not glNPOTOverride then ItemIndex := 0 else ItemIndex := 1;
 
+  with TGUISwitch(menu.GetControl('swInterp')) do
+    if gLerpActors then ItemIndex := 0 else ItemIndex := 1;
+
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
   TGUIScroll(menu.GetControl('scSoundLevel')).Value := Round(gSoundLevel/16);
@@ -683,7 +687,10 @@ begin
       else gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER;
     end;
 
-    gGameSettings.ItemRespawnTime := gsItemRespawnTime; // TODO: get this crap out of here
+    // TODO: get this crap out of here
+    gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+    gGameSettings.WarmupTime := gsWarmupTime;
+    gGameSettings.SpawnInvul := gsSpawnInvul;
   end;
 end;
 
@@ -2639,6 +2646,12 @@ begin
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
     end;
+    with AddSwitch(_lc[I_MENU_VIDEO_INTERPOLATION]) do
+    begin
+      Name := 'swInterp';
+      AddItem(_lc[I_MENU_YES]);
+      AddItem(_lc[I_MENU_NO]);
+    end;
     with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
     begin
       Name := 'swLegacyNPOT';