mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-28 23:12:24 +00:00
- fixed a merge conflict which wasn't flagged by TortoiseMerge.
This commit is contained in:
parent
3a7f51db88
commit
eca4fba0f6
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue