lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'menu-execs' into menu-execs-skyscroll

This commit is contained in:
mazmazz 2018-11-16 15:11:02 -05:00
parent 4d3ddda5b5 0e0437b894
commit 32dc47207d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/f_finale.c
View File

@ -257,11 +257,11 @@ static void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, char *patchname)
patheight = SHORT(pat->height);
skullAnimCounter = ((finalecount*scrollyspeed)/16 + patheight) % patheight;
fakedwidth = vid.width / vid.dupx;
fakedheight = vid.height / vid.dupy;
if (rendermode == render_soft)
if (rendermode == render_soft && !scrollyspeed)
{ // if only hardware rendering could be this elegant and complete
// keep the old behavior for non-vertical scrolling because *shrug*
fakedwidth = vid.width / vid.dupx;
fakedheight = vid.height / vid.dupy;
scrolled = (patwidth - animtimer) - 1;
yscrolled = (patheight - skullAnimCounter) - 1;
for (x = 0, mx = scrolled; x < fakedwidth; x++, mx = (mx+1)%patwidth)
@ -270,25 +270,25 @@ static void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, char *patchname)
F_DrawPatchCol(x, y, pat, mx);
}
}
#ifdef HWRENDER
else if (rendermode != render_none)
{ // if only software rendering could be this simple and retarded
// but this does work! because post scrolling goes over my head :upside_down:
INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
INT32 pw = patwidth * dupz, ph = patheight * dupz;
scrolled = animtimer * dupz;
yscrolled = skullAnimCounter * dupz;
CONS_Printf("XScroll %d> YScroll %d\n", scrolled, yscrolled);
for (x = 0; x < vid.width; x += pw)
{
for (y = 0; y < vid.height; y += ph)
{
if (scrolled > 0)
V_DrawScaledPatch(scrolled - pw, yscrolled - ph, V_NOSCALESTART, pat);
V_DrawScaledPatch(scrolled - pw, yscrolled - ph/2, V_NOSCALESTART, pat);
V_DrawScaledPatch(x + scrolled, y + yscrolled, V_NOSCALESTART, pat);
V_DrawScaledPatch(x + scrolled, yscrolled - ph/2, V_NOSCALESTART, pat);
}
}
}
#endif
W_UnlockCachedPatch(pat);
}