teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- implemented status bar scale control for Blood.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-02 08:48:23 +02:00
parent cc8798f6e2
commit b259b94300
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/blood/src/controls.cpp
View file

@ -134,8 +134,15 @@ void ctrlGetInput(void)
if (gViewMode == 3) if (gViewMode == 3)
{ {
buttonMap.ClearButton(gamefunc_Shrink_Screen); buttonMap.ClearButton(gamefunc_Shrink_Screen);
G_ChangeHudLayout(-1); if (!SHIFTS_IS_PRESSED)
} {
G_ChangeHudLayout(-1);
}
else
{
hud_scale = hud_scale - 4;
}
}
if (gViewMode == 2 || gViewMode == 4) if (gViewMode == 2 || gViewMode == 4)
{ {
gZoom = ClipLow(gZoom - (gZoom >> 4), 64); gZoom = ClipLow(gZoom - (gZoom >> 4), 64);
@ -148,7 +155,14 @@ void ctrlGetInput(void)
if (gViewMode == 3) if (gViewMode == 3)
{ {
buttonMap.ClearButton(gamefunc_Enlarge_Screen); buttonMap.ClearButton(gamefunc_Enlarge_Screen);
G_ChangeHudLayout(1); if (!SHIFTS_IS_PRESSED)
{
G_ChangeHudLayout(1);
}
else
{
hud_scale = hud_scale + 4;
}
} }
if (gViewMode == 2 || gViewMode == 4) if (gViewMode == 2 || gViewMode == 4)
{ {

5
source/blood/src/view.cpp
View file

@ -1190,7 +1190,10 @@ void viewResizeView(int size)
gViewX0 = 0; gViewX0 = 0;
gViewY0 = 0; gViewY0 = 0;
gViewX1 = xdim-1; gViewX1 = xdim-1;
gViewY1 = ydim-1-(25*ydim)/200; int gy1 = (25 * ydim) / 200;
if (gViewSize == 3) // full status bar must scale the bottom to the actual display height.
gy1 = Scale(gy1, hud_scale, 100);
gViewY1 = ydim-1- gy1;
if (gGameOptions.nGameType > 0 && gGameOptions.nGameType <= 3) if (gGameOptions.nGameType > 0 && gGameOptions.nGameType <= 3)
{ {
gViewY0 = (tilesiz[2229].y*ydim*((gNetPlayers+3)/4))/200; gViewY0 = (tilesiz[2229].y*ydim*((gNetPlayers+3)/4))/200;