zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- move hud scale CVARs to the backend.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-02 17:32:58 +02:00
parent 9076145319
commit a084667bed
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/engine/i_interface.h
View file

@ -36,6 +36,7 @@ struct SystemCallbacks
void (*StartCutscene)(bool blockui); void (*StartCutscene)(bool blockui);
void (*SetTransition)(int type); void (*SetTransition)(int type);
bool (*CheckCheatmode)(bool printmsg, bool sponly); bool (*CheckCheatmode)(bool printmsg, bool sponly);
void (*HudScaleChanged)();
}; };
extern SystemCallbacks sysCallbacks; extern SystemCallbacks sysCallbacks;

15
src/common/statusbar/base_sbar.cpp
View file

@ -46,6 +46,7 @@
#include "utf8.h" #include "utf8.h"
#include "v_text.h" #include "v_text.h"
#include "vm.h" #include "vm.h"
#include "i_interface.h"
FGameTexture* CrosshairImage; FGameTexture* CrosshairImage;
static int CrosshairNum; static int CrosshairNum;
@ -60,8 +61,18 @@ CVAR(Int, crosshairhealth, 2, CVAR_ARCHIVE);
CVARD(Float, crosshairscale, 0.5, CVAR_ARCHIVE, "changes the size of the crosshair"); CVARD(Float, crosshairscale, 0.5, CVAR_ARCHIVE, "changes the size of the crosshair");
CVAR(Bool, crosshairgrow, false, CVAR_ARCHIVE); CVAR(Bool, crosshairgrow, false, CVAR_ARCHIVE);
EXTERN_CVAR(Float, hud_scalefactor) CUSTOM_CVARD(Float, hud_scalefactor, 1, CVAR_ARCHIVE, "changes the hud scale")
EXTERN_CVAR(Bool, hud_aspectscale) {
if (self < 0.36f) self = 0.36f;
else if (self > 1) self = 1;
else if (sysCallbacks.HudScaleChanged) sysCallbacks.HudScaleChanged();
}
CUSTOM_CVARD(Bool, hud_aspectscale, true, CVAR_ARCHIVE, "enables aspect ratio correction for the status bar")
{
if (sysCallbacks.HudScaleChanged) sysCallbacks.HudScaleChanged();
}
void ST_LoadCrosshair(int num, bool alwaysload) void ST_LoadCrosshair(int num, bool alwaysload)
{ {

9
src/d_main.cpp
View file

@ -2961,6 +2961,14 @@ static void System_SetTransition(int type)
if (type != wipe_None) wipegamestate = type == wipe_Burn? GS_FORCEWIPEBURN : type == wipe_Fade? GS_FORCEWIPEFADE : GS_FORCEWIPEMELT; if (type != wipe_None) wipegamestate = type == wipe_Burn? GS_FORCEWIPEBURN : type == wipe_Fade? GS_FORCEWIPEFADE : GS_FORCEWIPEMELT;
} }
static void System_HudScaleChanged()
{
if (StatusBar)
{
StatusBar->SetScale();
setsizeneeded = true;
}
}
bool CheckSkipGameOptionBlock(const char* str); bool CheckSkipGameOptionBlock(const char* str);
@ -3531,6 +3539,7 @@ static int D_DoomMain_Internal (void)
System_StartCutscene, System_StartCutscene,
System_SetTransition, System_SetTransition,
CheckCheatmode, CheckCheatmode,
System_HudScaleChanged,
}; };

22
src/g_statusbar/shared_sbar.cpp
View file

@ -103,17 +103,6 @@ CVAR (Flag, pf_poison, paletteflash, PF_POISON)
CVAR (Flag, pf_ice, paletteflash, PF_ICE) CVAR (Flag, pf_ice, paletteflash, PF_ICE)
CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD) CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD)
CUSTOM_CVARD(Float, hud_scalefactor, 1, CVAR_ARCHIVE, "changes the hud scale")
{
if (self < 0.36f) self = 0.36f;
else if (self > 1) self = 1;
else if (StatusBar)
{
StatusBar->SetScale();
setsizeneeded = true;
}
}
// Stretch status bar to full screen width? // Stretch status bar to full screen width?
CUSTOM_CVAR (Int, st_scale, 0, CVAR_ARCHIVE) CUSTOM_CVAR (Int, st_scale, 0, CVAR_ARCHIVE)
@ -129,14 +118,9 @@ CUSTOM_CVAR (Int, st_scale, 0, CVAR_ARCHIVE)
setsizeneeded = true; setsizeneeded = true;
} }
} }
CUSTOM_CVAR(Bool, hud_aspectscale, false, CVAR_ARCHIVE)
{ EXTERN_CVAR(Float, hud_scalefactor)
if (StatusBar) EXTERN_CVAR(Bool, hud_aspectscale)
{
StatusBar->SetScale();
setsizeneeded = true;
}
}
CVAR (Bool, crosshairon, true, CVAR_ARCHIVE); CVAR (Bool, crosshairon, true, CVAR_ARCHIVE);
CVAR (Int, crosshair, 0, CVAR_ARCHIVE) CVAR (Int, crosshair, 0, CVAR_ARCHIVE)