zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'zmaster'

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-10 10:30:23 +01:00
commit bfbc160b0c
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_acs.cpp
View file

@ -5972,6 +5972,8 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
case ACSF_SetSectorTerrain: case ACSF_SetSectorTerrain:
if (argCount >= 3) if (argCount >= 3)
{
if (args[1] == sector_t::floor || args[1] == sector_t::ceiling)
{ {
int terrain = P_FindTerrain(FBehavior::StaticLookupString(args[2])); int terrain = P_FindTerrain(FBehavior::StaticLookupString(args[2]));
FSectorTagIterator it(args[0]); FSectorTagIterator it(args[0]);
@ -5981,6 +5983,8 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
sectors[s].terrainnum[args[1]] = terrain; sectors[s].terrainnum[args[1]] = terrain;
} }
} }
}
break;
default: default:
break; break;

2
src/timidity/timidity.cpp
View file

@ -698,7 +698,7 @@ Renderer::Renderer(float sample_rate, const char *args)
if (def_instr_name.IsNotEmpty()) if (def_instr_name.IsNotEmpty())
set_default_instrument(def_instr_name); set_default_instrument(def_instr_name);
voices = clamp<int>(midi_voices, 16, 256); voices = MAX(*midi_voices, 16);
voice = new Voice[voices]; voice = new Voice[voices];
drumchannels = DEFAULT_DRUMCHANNELS; drumchannels = DEFAULT_DRUMCHANNELS;
} }