diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 23fbf2e947c3f77ac7a455db154a71b120ad6c97..d720619bed89ae2a073e34c8481e968ed1a6e871 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
- if TGUISwitch(menu.GetControl('swBPP')).ItemIndex = 0 then
- gBPP := 16
- else
- gBPP := 32;
+ case TGUISwitch(menu.GetControl('swBPP')).ItemIndex of
+ 0: gBPP := 8;
+ 1: gBPP := 15;
+ 2: gBPP := 16;
+ 3: gBPP := 24;
+ 4: gBPP := 32;
+ else gBPP := 32
+ end;
ovs := gVSync;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
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'));
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
with TGUISwitch(menu.GetControl('swBPP')) do
- if gBPP = 16 then
- ItemIndex := 0
- else
- ItemIndex := 1;
+ case gBPP of
+ 8: ItemIndex := 0;
+ 15: ItemIndex := 1;
+ 16: ItemIndex := 2;
+ 24: ItemIndex := 3;
+ 32: ItemIndex := 4;
+ else ItemIndex := 4
+ end;
with TGUISwitch(menu.GetControl('swTextureFilter')) do
if gTextureFilter then ItemIndex := 0 else ItemIndex := 1;
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'));
g_Texture_CreateWADEx('FONT_STD', GameWAD+':FONTS\'+texture);
config := TConfig.CreateMem(cfgdata, cfglen);
- cwdt := Min(Max(config.ReadInt('FontMap', 'CharWidth', 0), 0), 255);
- chgt := Min(Max(config.ReadInt('FontMap', 'CharHeight', 0), 0), 255);
+ cwdt := Min(Max(config.ReadInt('FontMap', 'CharWidth', 1), 1), 255);
+ chgt := Min(Max(config.ReadInt('FontMap', 'CharHeight', 1), 1), 255);
spc := Min(Max(config.ReadInt('FontMap', 'Kerning', 0), -128), 127);
+ e_LogWritefln('LoadStdFont cwdt=%s chgt=%s spc=%s', [cwdt, chgt, spc]);
+
if g_Texture_Get('FONT_STD', ID) then
e_TextureFontBuild(ID, FontID, cwdt, chgt, spc);
Sort := True;
Dirs := True;
- FileMask := '*.wad|*.pk3|*.zip';
+ FileMask := '*.wad|*.pk3|*.zip|*.dfz';
SetBase(MapsDir+'megawads/');
end;
Sort := True;
Dirs := True;
- FileMask := '*.wad|*.pk3|*.zip';
+ FileMask := '*.wad|*.pk3|*.zip|*.dfz';
SetBase(MapsDir);
end;
with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
with AddSwitch(_lc[I_MENU_VIDEO_BPP]) do
begin
Name := 'swBPP';
+ AddItem('8');
+ AddItem('15');
AddItem('16');
+ AddItem('24');
AddItem('32');
end;
with AddSwitch(_lc[I_MENU_VIDEO_VSYNC]) do
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';