diff --git a/src/r_segs.cpp b/src/r_segs.cpp index b738b1c10..bca838cbe 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -227,6 +227,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) sector_t tempsec; // killough 4/13/98 fixed_t texheight, texheightscale; bool notrelevant = false; + fixed_t rowoffset; const sector_t *sec; @@ -328,7 +329,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) dc_texturemid = MIN (frontsector->GetPlaneTexZ(sector_t::ceiling), backsector->GetPlaneTexZ(sector_t::ceiling)); } - fixed_t rowoffset = curline->sidedef->GetTextureYOffset(side_t::mid); + rowoffset = curline->sidedef->GetTextureYOffset(side_t::mid); if (!(curline->linedef->flags & ML_WRAP_MIDTEX) && !(curline->sidedef->Flags & WALLF_WRAP_MIDTEX)) diff --git a/src/sound/music_dumb.cpp b/src/sound/music_dumb.cpp index 8b196e7cd..1e9b6d6fc 100644 --- a/src/sound/music_dumb.cpp +++ b/src/sound/music_dumb.cpp @@ -129,6 +129,7 @@ CVAR(Bool, mod_autochip, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_size_force, 100, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_size_scan, 500, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_scan_threshold, 12, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); +CVAR(Float, mod_dumb_mastervolume, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); // PRIVATE DATA DEFINITIONS ------------------------------------------------ @@ -974,7 +975,7 @@ bool input_mod::read(SoundStream *stream, void *buffer, int sizebytes, void *use // Convert to float for (int i = 0; i < written * 2; ++i) { - ((float *)buffer)[i] = ((int *)buffer)[i] / (float)(1 << 24); + ((float *)buffer)[i] = (((int *)buffer)[i] / (float)(1 << 24)) * mod_dumb_mastervolume; } } buffer = (BYTE *)buffer + written * 8; diff --git a/src/sound/oalsound.h b/src/sound/oalsound.h index 4f6bae396..de9789f22 100644 --- a/src/sound/oalsound.h +++ b/src/sound/oalsound.h @@ -7,6 +7,8 @@ #ifndef NO_OPENAL +#define AL_NO_PROTOTYPES + #include "al.h" #include "alc.h" diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 8bd205636..268787a2b 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1663,6 +1663,7 @@ OptionMenu ModReplayerOptions Title "MODULE REPLAYER OPTIONS" Option "Replayer engine", "mod_dumb", "ModReplayers" StaticText " " + Slider "Master Volume", "mod_dumb_mastervolume", 1, 32, 1, 1 Option "Sample rate", "mod_samplerate", "SampleRates", "mod_dumb" Option "Quality", "mod_interp", "ModQuality", "mod_dumb" Option "Volume ramping", "mod_volramp", "ModVolumeRamps", "mod_dumb"