proper GUI fix for file listers

[d2df-sdl.git] / src / game / g_menu.pas

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 231737bb1db45fba057737caf4bf4feee5a3cdfd..f2abfb72daf04ca688986d1f544f18fbbae5e076 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -49,6 +49,7 @@ begin
     gBPP := 32;
   gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
   gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
+  glLegacyNPOT := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
 
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
@@ -214,6 +215,9 @@ begin
   with TGUISwitch(menu.GetControl('swVSync')) do
     if gVSync then ItemIndex := 0 else ItemIndex := 1;
 
+  with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
+    if not glLegacyNPOT then ItemIndex := 0 else ItemIndex := 1;
+
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
   TGUIScroll(menu.GetControl('scSoundLevel')).Value := Round(gSoundLevel/16);
@@ -1610,7 +1614,7 @@ begin
           _x := _x+h;
         end;
 
-      with TGUILabel(Result.AddChild(TGUILabel.Create('(Y\N)', FontID))) do
+      with TGUILabel(Result.AddChild(TGUILabel.Create('(Y/N)', FontID))) do
       begin
         X := (gScreenWidth div 2)-(GetWidth div 2);
         Y := _x;
@@ -2176,7 +2180,7 @@ begin
 
       Sort := True;
       Dirs := True;
-      FileMask := '*.wad';
+      FileMask := '*.wad|*.pk3|*.zip';
       SetBase(MapsDir+'megawads/');
     end;
 
@@ -2231,7 +2235,7 @@ begin
 
       Sort := True;
       Dirs := True;
-      FileMask := '*.wad';
+      FileMask := '*.wad|*.pk3|*.zip';
       SetBase(MapsDir);
     end;
     with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
@@ -2333,6 +2337,12 @@ begin
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
     end;
+    with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
+    begin
+      Name := 'swLegacyNPOT';
+      AddItem(_lc[I_MENU_NO]);
+      AddItem(_lc[I_MENU_YES]);
+    end;
     AddSpace();
     AddText(_lc[I_MENU_VIDEO_NEED_RESTART], Round(gScreenWidth*0.6));
     ReAlign();
@@ -2683,6 +2693,13 @@ begin
     _y := _y+22;
   end;
   with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_1], gMenuSmallFont))) do
+  begin
+    Color := _RGB(255, 255, 255);
+    X := cx+32;
+    Y := _y;
+    _y := _y+22;
+  end;
+  with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_2], gMenuSmallFont))) do
   begin
     Color := _RGB(255, 255, 255);
     X := cx+32;