diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 3513439d44e4b2574f2e33b1b64c9351324a74e6..fe650785d11a8b34baa3b623089b0788e1b37349 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
PromptIP: string;
PromptPort: Word;
TempScale: Integer = -1;
PromptIP: string;
PromptPort: Word;
TempScale: Integer = -1;
+ TempResScale: Integer = -1;
implementation
implementation
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
- IntToStr(gScreenWidth) +
- ' x ' + IntToStr(gScreenHeight) +
+ IntToStr(gWinSizeX) +
+ ' x ' + IntToStr(gWinSizeY) +
', ' + IntToStr(gBPP) + ' bpp';
with TGUIListBox(menu.GetControl('lsResolution')) do
', ' + IntToStr(gBPP) + ' bpp';
with TGUIListBox(menu.GetControl('lsResolution')) do
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
+
+ TempResScale := Round(r_pixel_scale - 1);
+ TGUIScroll(menu.GetControl('scResFactor')).Value := TempResScale;
end;
procedure ProcApplyVideoOptions();
end;
procedure ProcApplyVideoOptions();
menu: TGUIMenu;
Fullscreen: Boolean;
SWidth, SHeight: Integer;
menu: TGUIMenu;
Fullscreen: Boolean;
SWidth, SHeight: Integer;
+ ScaleChanged: Boolean;
str: String;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
str: String;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
- SScanf(str, '%dx%d', [@SWidth, @SHeight]);
+ if str <> '' then
+ SScanf(str, '%dx%d', [@SWidth, @SHeight])
+ else
+ begin
+ SWidth := gWinSizeX;
+ SHeight := gWinSizeY;
+ end;
Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
- if (SWidth <> gScreenWidth) or
- (SHeight <> gScreenHeight) or
- (Fullscreen <> gFullscreen) then
+ ScaleChanged := False;
+ if TGUIScroll(menu.GetControl('scResFactor')).Value <> TempResScale then
+ begin
+ TempResScale := TGUIScroll(menu.GetControl('scResFactor')).Value;
+ r_pixel_scale := TempResScale + 1;
+ ScaleChanged := True;
+ end;
+
+ if (SWidth <> gWinSizeX) or
+ (SHeight <> gWinSizeY) or
+ (Fullscreen <> gFullscreen) or
+ ScaleChanged then
begin
gResolutionChange := True;
gRC_Width := SWidth;
begin
gResolutionChange := True;
gRC_Width := SWidth;
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
+ with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
+ begin
+ Name := 'scResFactor';
+ Max := 10;
+ end;
AddSpace();
AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
UpdateIndex();
AddSpace();
AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
UpdateIndex();