From eca4fba0f638a40d27f7262bad14baf4b98a4a4e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Wed, 2 Nov 2016 14:15:09 +0100
Subject: [PATCH] - fixed a merge conflict which wasn't flagged by
 TortoiseMerge.

---
 src/p_actionfunctions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_actionfunctions.cpp b/src/p_actionfunctions.cpp
index c625bd927e..7ec8bb874d 100644
--- a/src/p_actionfunctions.cpp
+++ b/src/p_actionfunctions.cpp
@@ -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)
 	{