From 64e77088323528ed87ecddca56410695f72d42d8 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 25 Oct 2019 21:36:10 -0700 Subject: [PATCH 1/2] I say damn you massive initializer! --- src/s_sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 00576ff55..22bc848fe 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -118,8 +118,8 @@ consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_O consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL}; // Window focus sound sytem toggles -consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo}; -consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo}; +consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; #ifdef HAVE_OPENMPT static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}}; From 634292a5fcb3f5e23fde350a2428ae8bbbca1640 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 25 Oct 2019 21:44:34 -0700 Subject: [PATCH 2/2] Differing signedness comparison --- src/p_mobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index e071f79d8..5735dc27b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7976,7 +7976,7 @@ void P_MobjThinker(mobj_t *mobj) INT32 strength; ++mobj->movedir; mobj->frame &= ~FF_TRANSMASK; - strength = min(mobj->fuse, mobj->movedir)*3; + strength = min(mobj->fuse, (INT32)mobj->movedir)*3; if (strength < 10) mobj->frame |= ((10-strength)<<(FF_TRANSSHIFT)); }