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

This commit is contained in:
Christoph Oelckers 2016-11-02 14:15:09 +01:00
parent 3a7f51db88
commit eca4fba0f6

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)
{