zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed hud_scale for Shadow Warrior.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-22 15:21:07 +01:00
parent 09106b3159
commit dcbb936a9b
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/common/gamecontrol.cpp
View file

@ -614,9 +614,14 @@ int RunGame()
if (g_gameType & GAMEFLAG_BLOOD) if (g_gameType & GAMEFLAG_BLOOD)
{ {
mus_redbook.SetGenericRepDefault(false, CVAR_Bool); // Blood should default to CD Audio off - all other games must default to on. mus_redbook.SetGenericRepDefault(false, CVAR_Bool); // Blood should default to CD Audio off - all other games must default to on.
hud_size.SetGenericRepDefault(6, CVAR_Int); // HUD is different for everything. hud_size.SetGenericRepDefault(6, CVAR_Int);
hud_size_max = 7; hud_size_max = 7;
} }
if (g_gameType & GAMEFLAG_SW)
{
hud_size.SetGenericRepDefault(8, CVAR_Int);
hud_size_max = 9;
}
G_ReadConfig(currentGame); G_ReadConfig(currentGame);

10
source/sw/src/game.cpp
View file

@ -3925,19 +3925,13 @@ void Saveable_Init_Dynamic()
saveable_build.numdata = NUM_SAVEABLE_ITEMS(saveable_build_data); saveable_build.numdata = NUM_SAVEABLE_ITEMS(saveable_build_data);
} }
/*extern*/ bool GameInterface::validate_hud(int requested_size) void GameInterface::set_hud_layout(int requested_size)
{
return requested_size != 10 && requested_size != 8;
}
/*extern*/ void GameInterface::set_hud_layout(int requested_size)
{ {
if (requested_size >= 11) requested_size = 9;
else if (requested_size >= 9) requested_size = 8;
gs.BorderNum = 9 - requested_size; gs.BorderNum = 9 - requested_size;
SetBorder(Player + myconnectindex, gs.BorderNum); SetBorder(Player + myconnectindex, gs.BorderNum);
SetRedrawScreen(Player + myconnectindex); SetRedrawScreen(Player + myconnectindex);
} }
/*extern*/ void GameInterface::set_hud_scale(int requested_size) { /* the relevant setting is gs.BorderNum */ } /*extern*/ void GameInterface::set_hud_scale(int requested_size) { }
::GameInterface* CreateInterface() ::GameInterface* CreateInterface()
{ {

1
source/sw/src/game.h
View file

@ -2432,7 +2432,6 @@ struct GameInterface : ::GameInterface
void UpdateScreenSize() override; void UpdateScreenSize() override;
void FreeGameData() override; void FreeGameData() override;
bool GenerateSavePic() override; bool GenerateSavePic() override;
bool validate_hud(int) override;
void set_hud_layout(int size) override; void set_hud_layout(int size) override;
void set_hud_scale(int size) override; void set_hud_scale(int size) override;
void DrawNativeMenuText(int fontnum, int state, double xpos, double ypos, float fontscale, const char* text, int flags) override; void DrawNativeMenuText(int fontnum, int state, double xpos, double ypos, float fontscale, const char* text, int flags) override;

4
wadsrc/static/engine/menudef.txt
View file

@ -1206,6 +1206,10 @@ OptionMenu "HUDOptions" //protected
{ {
Slider "$DSPLYMNU_SCREENSIZE", "hud_size", 0.0, 7.0, 1.0, -1 Slider "$DSPLYMNU_SCREENSIZE", "hud_size", 0.0, 7.0, 1.0, -1
} }
ifgame(shadowwarrior)
{
Slider "$DSPLYMNU_SCREENSIZE", "hud_size", 0.0, 9.0, 1.0, -1
}
Option "$DSPLYMNU_LEVELSTATS", "hud_stats", "OnOff" Option "$DSPLYMNU_LEVELSTATS", "hud_stats", "OnOff"
ifgame(duke, nam, ww2gi, redneck, redneckrides, fury) ifgame(duke, nam, ww2gi, redneck, redneckrides, fury)