diff --git a/src/f_finale.c b/src/f_finale.c index 6cea5f52c..245490224 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -64,6 +64,7 @@ static patch_t *ttkflash; // flash screen static patch_t *driver[2]; // Driving character on the waiting screen static UINT8 *waitcolormap; // colormap for the spinning character +static INT32 waitscale = 1<>1))<>1))<width / 2, 150<width / 2, 150< 720) && (vid.height > 1280)) // ehhhh well this thing has so many issues, so ill lock it to higher resolutions instead + { + vid.dupx = FixedDiv(vid.dupx, cv_highreshudscale.value); + vid.dupy = FixedDiv(vid.dupy, cv_highreshudscale.value); + vid.fdupx = FixedDiv(vid.fdupx, cv_highreshudscale.value); + vid.fdupy = FixedDiv(vid.fdupy, cv_highreshudscale.value); + } + #ifdef HWRENDER //if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl // 13/11/18: diff --git a/src/screen.h b/src/screen.h index 9730ad8de..4d26f2138 100644 --- a/src/screen.h +++ b/src/screen.h @@ -139,6 +139,7 @@ extern INT32 scr_bpp; extern UINT8 *scr_borderpatch; // patch used to fill the view borders extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen; +extern consvar_t cv_highreshudscale; // wait for page flipping to end or not extern consvar_t cv_vidwait; extern consvar_t cv_timescale; diff --git a/src/v_video.c b/src/v_video.c index 6d9a801bc..887401dde 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -19,6 +19,7 @@ #include "hu_stuff.h" #include "r_draw.h" #include "r_main.h" +#include "r_fps.h" #include "console.h" #include "i_video.h" // rendermode @@ -1412,7 +1413,7 @@ void V_DrawVhsEffect(boolean rewind) if (rewind) V_DrawVhsEffect(false); // experimentation - fixed_t frac = cv_uncappedhud.value ? FixedMul(renderdeltatics, cv_timescale.value) : (renderisnewtic ? FRACUNIT : 0); + fixed_t frac = R_UsingFrameInterpolation() ? renderdeltatics : FRACUNIT; upbary -= frac * (vid.dupy * (rewind ? 3 : 1.8f)); downbary += frac * (vid.dupy * (rewind ? 2 : 1)); diff --git a/src/w_wad.c b/src/w_wad.c index 84d243bd9..53c3b608d 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -826,9 +826,11 @@ UINT16 W_InitFile(const char *filename, boolean local) wadfiles[numwadfiles] = wadfile; numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded - // Read shaders from file - if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) - HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3)); +#ifdef HWRENDER + // Read shaders from file + if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) + HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3)); +#endif // TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now. switch (wadfile->type)