AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 19:38:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use consistent purge tag (#1225)

Browse Source 
* Use consistent purge tag

* Add comment

* Revert "Add comment"

This reverts commit 070f291d451c197b77886b8fdd7ab544871a68ad.

* Revert "Use consistent purge tag"

This reverts commit 5507bd368674df34390d0cd9c6ffcdc331a368ef.

* Always use `PU_CACHE`

* Update pointer just before drawing

* Use accurate comments

* Use local variables for `PU_CACHE`
This commit is contained in:
ceski 2023-10-15 00:08:47 -07:00 committed by GitHub
parent a19eaca101
commit b56177c3db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/st_stuff.c
View File

@ -235,9 +235,6 @@ static patch_t *faceback[MAXPLAYERS]; // killough 3/7/98: make array
// main bar right
static patch_t *armsbg;
// Bezel bottom edge for st_solidbackground.
static patch_t *bezel;
// weapon ownership patches
static patch_t *arms[6][2];
@ -416,10 +413,12 @@ void ST_refreshBackground(boolean force)
// [crispy] preserve bezel bottom edge
if (scaledviewwidth == SCREENWIDTH)
{
patch_t *const patch = W_CacheLumpName("brdr_b", PU_CACHE);
for (x = 0; x < WIDESCREENDELTA; x += 8)
{
V_DrawPatch(x - WIDESCREENDELTA, 0, BG, bezel);
V_DrawPatch(ORIGWIDTH + WIDESCREENDELTA - x - 8, 0, BG, bezel);
V_DrawPatch(x - WIDESCREENDELTA, 0, BG, patch);
V_DrawPatch(ORIGWIDTH + WIDESCREENDELTA - x - 8, 0, BG, patch);
}
}
}
@ -1082,9 +1081,6 @@ void ST_loadGraphics(void)
break;
}
have_xdthfaces = i;
// Bezel bottom edge for st_solidbackground.
bezel = W_CacheLumpName("BRDR_B", PU_STATIC);
}
void ST_loadData(void)
@ -1306,6 +1302,10 @@ static int StatusBarBufferHeight(void)
{
int i;
int st_height = ST_HEIGHT;
patch_t *const patch = W_CacheLumpName("brdr_b", PU_CACHE);
if (patch && patch->height > st_height)
st_height = patch->height;
if (sbar && sbar->height > st_height)
st_height = sbar->height;
@ -1313,9 +1313,6 @@ static int StatusBarBufferHeight(void)
if (armsbg && armsbg->height > st_height)
st_height = armsbg->height;
if (bezel && bezel->height > st_height)
st_height = bezel->height;
for (i = 0; i < MAXPLAYERS; i++)
{
if (faceback[i] && faceback[i]->height > st_height)
@ -1346,6 +1343,13 @@ void ST_Init(void)
void ST_Warnings(void)
{
int i;
patch_t *const patch = W_CacheLumpName("brdr_b", PU_CACHE);
if (patch && patch->height > ST_HEIGHT)
{
I_Printf(VB_WARNING, "ST_Init: Non-standard BRDR_B height of %d. "
"Expected <= %d.", patch->height, ST_HEIGHT);
}
if (sbar && sbar->height != ST_HEIGHT)
{
@ -1359,12 +1363,6 @@ void ST_Warnings(void)
"Expected <= %d.", armsbg->height, ST_HEIGHT);
}
if (bezel && bezel->height > ST_HEIGHT)
{
I_Printf(VB_WARNING, "ST_Init: Non-standard BRDR_B height of %d. "
"Expected <= %d.", bezel->height, ST_HEIGHT);
}
for (i = 0; i < MAXPLAYERS; i++)
{
if (faceback[i] && faceback[i]->height > ST_HEIGHT)