From 3e1aa40461fac188e5525d6fc52d32a6dcc176a1 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Thu, 17 Jan 2013 19:42:52 +0000
Subject: [PATCH] - Fixed: If AInventory::SpecialDropAction returns true the
 item should be destroyed. - Fixed: Building with SSE disabled triggered an
 error.

SVN r4028 (trunk)
---
 src/nodebuild.cpp | 2 ++
 src/p_enemy.cpp   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/nodebuild.cpp b/src/nodebuild.cpp
index a4b568683..c13527d87 100644
--- a/src/nodebuild.cpp
+++ b/src/nodebuild.cpp
@@ -1116,12 +1116,14 @@ int ClassifyLineBackpatchC (node_t &node, const FSimpleVert *v1, const FSimpleVe
 #endif
 //	printf ("Patching for SSE %d @ %p %d\n", SSELevel, calleroffset, *calleroffset);
 
+#ifndef DISABLE_SSE
 	if (CPU.bSSE2)
 	{
 		func = ClassifyLineSSE2;
 		diff = int((char *)ClassifyLineSSE2 - (char *)calleroffset);
 	}
 	else
+#endif
 	{
 		func = ClassifyLine2;
 		diff = int((char *)ClassifyLine2 - (char *)calleroffset);
diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp
index 46104ad18..6cf7d7be6 100644
--- a/src/p_enemy.cpp
+++ b/src/p_enemy.cpp
@@ -3069,6 +3069,8 @@ AInventory *P_DropItem (AActor *source, const PClass *type, int dropamount, int
 				ModifyDropAmount(inv, dropamount);
 				if (inv->SpecialDropAction (source))
 				{
+					// The special action indicates that the item should not spawn
+					inv->Destroy();
 					return NULL;
 				}
 				return inv;