Merge branch 'fix_skipintro' into 'master'
Fix -skipintro in OpenGL See merge request STJr/SRB2Internal!308
This commit is contained in:
commit
a287b9e317
|
@ -856,8 +856,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
// Done
|
//if (rendermode != render_soft && !con_startup) // Not this again
|
||||||
if (rendermode != render_soft && !con_startup)
|
if (rendermode != render_soft)
|
||||||
{
|
{
|
||||||
HWR_DrawCroppedPatch((GLPatch_t*)patch,x,y,pscale,scrn,sx,sy,w,h);
|
HWR_DrawCroppedPatch((GLPatch_t*)patch,x,y,pscale,scrn,sx,sy,w,h);
|
||||||
return;
|
return;
|
||||||
|
@ -1174,7 +1174,8 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode != render_soft && !con_startup)
|
//if (rendermode != render_soft && !con_startup) // Not this again
|
||||||
|
if (rendermode != render_soft)
|
||||||
{
|
{
|
||||||
HWR_DrawFill(x, y, w, h, c);
|
HWR_DrawFill(x, y, w, h, c);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue