Merge branch 'titlecard-clowning' into 'next'
Stretch the fallback titlecard to the screen See merge request STJr/SRB2!1019
This commit is contained in:
commit
1bdcb8d92f
|
@ -141,7 +141,6 @@ static y_data data;
|
||||||
|
|
||||||
// graphics
|
// graphics
|
||||||
static patch_t *bgpatch = NULL; // INTERSCR
|
static patch_t *bgpatch = NULL; // INTERSCR
|
||||||
static patch_t *widebgpatch = NULL; // INTERSCW
|
|
||||||
static patch_t *bgtile = NULL; // SPECTILE/SRB2BACK
|
static patch_t *bgtile = NULL; // SPECTILE/SRB2BACK
|
||||||
static patch_t *interpic = NULL; // custom picture defined in map header
|
static patch_t *interpic = NULL; // custom picture defined in map header
|
||||||
static boolean usetile;
|
static boolean usetile;
|
||||||
|
@ -330,7 +329,7 @@ void Y_IntermissionDrawer(void)
|
||||||
safetorender = false;
|
safetorender = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!usebuffer || !safetorender)
|
if (!safetorender)
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
|
||||||
|
|
||||||
if (!safetorender)
|
if (!safetorender)
|
||||||
|
@ -359,12 +358,11 @@ void Y_IntermissionDrawer(void)
|
||||||
else if (rendermode != render_soft && usebuffer)
|
else if (rendermode != render_soft && usebuffer)
|
||||||
HWR_DrawIntermissionBG();
|
HWR_DrawIntermissionBG();
|
||||||
#endif
|
#endif
|
||||||
else
|
|
||||||
{
|
|
||||||
if (widebgpatch && rendermode == render_soft && vid.width / vid.dupx == 400)
|
|
||||||
V_DrawScaledPatch(0, 0, V_SNAPTOLEFT, widebgpatch);
|
|
||||||
else if (bgpatch)
|
else if (bgpatch)
|
||||||
V_DrawScaledPatch(0, 0, 0, bgpatch);
|
{
|
||||||
|
fixed_t hs = vid.width * FRACUNIT / BASEVIDWIDTH;
|
||||||
|
fixed_t vs = vid.height * FRACUNIT / BASEVIDHEIGHT;
|
||||||
|
V_DrawStretchyFixedPatch(0, 0, hs, vs, V_NOSCALEPATCH, bgpatch, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (bgtile)
|
else if (bgtile)
|
||||||
|
@ -1266,7 +1264,6 @@ void Y_StartIntermission(void)
|
||||||
data.coop.actnum = mapheaderinfo[gamemap-1]->actnum;
|
data.coop.actnum = mapheaderinfo[gamemap-1]->actnum;
|
||||||
|
|
||||||
// get background patches
|
// get background patches
|
||||||
widebgpatch = W_CachePatchName("INTERSCW", PU_PATCH);
|
|
||||||
bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
|
bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
|
||||||
|
|
||||||
// grab an interscreen if appropriate
|
// grab an interscreen if appropriate
|
||||||
|
@ -2084,7 +2081,6 @@ static void Y_UnloadData(void)
|
||||||
|
|
||||||
// unload the background patches
|
// unload the background patches
|
||||||
UNLOAD(bgpatch);
|
UNLOAD(bgpatch);
|
||||||
UNLOAD(widebgpatch);
|
|
||||||
UNLOAD(bgtile);
|
UNLOAD(bgtile);
|
||||||
UNLOAD(interpic);
|
UNLOAD(interpic);
|
||||||
|
|
||||||
|
@ -2127,7 +2123,6 @@ static void Y_CleanupData(void)
|
||||||
{
|
{
|
||||||
// unload the background patches
|
// unload the background patches
|
||||||
CLEANUP(bgpatch);
|
CLEANUP(bgpatch);
|
||||||
CLEANUP(widebgpatch);
|
|
||||||
CLEANUP(bgtile);
|
CLEANUP(bgtile);
|
||||||
CLEANUP(interpic);
|
CLEANUP(interpic);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue