diff --git a/src/f_finale.c b/src/f_finale.c index fbee630b6..1b8d236fe 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1060,8 +1060,8 @@ void F_TitleScreenTicker(boolean run) return; // are demos disabled? - if (!cv_rollingdemos.value) - return; + if (!cv_rollingdemos.value || modifiedgame) // occasionally mappacks supply invalid replays which means the game crashes almost always when you idle on the titlescreen too long + return; // we check for all addons since added luas/socs and stuff like that makes them desynch like crazy so why would you even watch them? // Wait for a while (for the music to finish, preferably) // before starting demos diff --git a/src/v_video.c b/src/v_video.c index 17a44fd57..3266953ed 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -663,6 +663,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca } v_colormap = NULL; + if (colormap) { v_colormap = colormap; @@ -671,21 +672,25 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca dupx = vid.dupx; dupy = vid.dupy; - if (scrn & V_SCALEPATCHMASK) switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT) + + if (scrn & V_SCALEPATCHMASK) { - case 1: // V_NOSCALEPATCH - dupx = dupy = 1; - break; - case 2: // V_SMALLSCALEPATCH - dupx = vid.smalldupx; - dupy = vid.smalldupy; - break; - case 3: // V_MEDSCALEPATCH - dupx = vid.meddupx; - dupy = vid.meddupy; - break; - default: - break; + switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT) + { + case 1: // V_NOSCALEPATCH + dupx = dupy = 1; + break; + case 2: // V_SMALLSCALEPATCH + dupx = vid.smalldupx; + dupy = vid.smalldupy; + break; + case 3: // V_MEDSCALEPATCH + dupx = vid.meddupx; + dupy = vid.meddupy; + break; + default: + break; + } } // only use one dup, to avoid stretching (har har) @@ -910,7 +915,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ deststop = desttop + vid.rowbytes * vid.height; - if (scrn & V_NOSCALESTART) { + if (scrn & V_NOSCALESTART) + { x >>= FRACBITS; y >>= FRACBITS; desttop += (y*vid.width) + x;