From fd9c450c6e5db2d92e93b13b81986d3062b7d96f Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 21 Aug 2013 22:28:53 -0500
Subject: [PATCH] Fix merge for ACS's DropItem

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

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 57a4c51c0..905fa574f 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -5238,7 +5238,7 @@ doplaysound:			if (funcIndex == ACSF_PlayActorSound)
 			const char *type = FBehavior::StaticLookupString(args[1]);
 			int amount = argCount >= 3? args[2] : -1;
 			int chance = argCount >= 4? args[3] : 256;
-			const PClass *cls = PClass::FindClass(type);
+			PClassActor *cls = PClass::FindActor(type);
 			int cnt = 0;
 			if (cls != NULL)
 			{