zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-02 14:53:48 +01:00
commit e12174ffc1
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/r_segs.cpp
View file

@ -227,6 +227,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
sector_t tempsec; // killough 4/13/98 sector_t tempsec; // killough 4/13/98
fixed_t texheight, texheightscale; fixed_t texheight, texheightscale;
bool notrelevant = false; bool notrelevant = false;
fixed_t rowoffset;
const sector_t *sec; 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)); 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) && if (!(curline->linedef->flags & ML_WRAP_MIDTEX) &&
!(curline->sidedef->Flags & WALLF_WRAP_MIDTEX)) !(curline->sidedef->Flags & WALLF_WRAP_MIDTEX))

3
src/sound/music_dumb.cpp
View file

@ -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_force, 100, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Int, mod_autochip_size_scan, 500, 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(Int, mod_autochip_scan_threshold, 12, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Float, mod_dumb_mastervolume, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -974,7 +975,7 @@ bool input_mod::read(SoundStream *stream, void *buffer, int sizebytes, void *use
// Convert to float // Convert to float
for (int i = 0; i < written * 2; ++i) 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; buffer = (BYTE *)buffer + written * 8;

2
src/sound/oalsound.h
View file

@ -7,6 +7,8 @@
#ifndef NO_OPENAL #ifndef NO_OPENAL
#define AL_NO_PROTOTYPES
#include "al.h" #include "al.h"
#include "alc.h" #include "alc.h"

1
wadsrc/static/menudef.txt
View file

@ -1663,6 +1663,7 @@ OptionMenu ModReplayerOptions
Title "MODULE REPLAYER OPTIONS" Title "MODULE REPLAYER OPTIONS"
Option "Replayer engine", "mod_dumb", "ModReplayers" Option "Replayer engine", "mod_dumb", "ModReplayers"
StaticText " " StaticText " "
Slider "Master Volume", "mod_dumb_mastervolume", 1, 32, 1, 1
Option "Sample rate", "mod_samplerate", "SampleRates", "mod_dumb" Option "Sample rate", "mod_samplerate", "SampleRates", "mod_dumb"
Option "Quality", "mod_interp", "ModQuality", "mod_dumb" Option "Quality", "mod_interp", "ModQuality", "mod_dumb"
Option "Volume ramping", "mod_volramp", "ModVolumeRamps", "mod_dumb" Option "Volume ramping", "mod_volramp", "ModVolumeRamps", "mod_dumb"