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

- fixed a merge conflict which wasn't flagged by TortoiseMerge.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-02 14:15:09 +01:00
parent 3a7f51db88
commit eca4fba0f6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_actionfunctions.cpp
View file

@ -994,7 +994,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_PlaySound)
PARAM_FLOAT_DEF (volume);
PARAM_BOOL_DEF (looping);
PARAM_FLOAT_DEF (attenuation);
PARAM_BOOL_OPT (local) { local = false; }
PARAM_BOOL_DEF (local);
if (!looping)
{