From 1d42a97e08f40beaa3243a18d1753f50e085d2cc Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 10 Aug 2018 14:25:24 +0100 Subject: [PATCH] Wolfs flagged up midi variable stuff in his review so far, so this is a correction in that vein. --- src/d_main.c | 6 +++--- src/doomstat.h | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index c9f80180..120307e3 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -125,11 +125,11 @@ INT32 postimgparam3; postimg_t postimgtype4 = postimg_none; INT32 postimgparam4; #ifdef _XBOX -boolean nomidimusic = false; +//boolean nomidimusic = false; boolean nosound = true; boolean nodigimusic = true; #else -boolean nomidimusic = false; +//boolean nomidimusic = false; boolean nosound = false; boolean nodigimusic = false; // No fmod-based music #endif @@ -137,7 +137,7 @@ boolean nodigimusic = false; // No fmod-based music // These variables are only true if // the respective sound system is initialized // and active, but no sounds/music should play. -boolean music_disabled = false; +//boolean music_disabled = false; boolean sound_disabled = false; boolean digital_disabled = false; diff --git a/src/doomstat.h b/src/doomstat.h index 8f1469a3..09cd7ca7 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -86,10 +86,12 @@ extern boolean forceresetplayers; // Internal parameters for sound rendering. // ======================================== -extern boolean nomidimusic; // defined in d_main.c +//extern boolean nomidimusic; // defined in d_main.c +#define nomidimusic true extern boolean nosound; extern boolean nodigimusic; -extern boolean music_disabled; +//extern boolean music_disabled; +#define music_disabled false extern boolean sound_disabled; extern boolean digital_disabled;