From 5564b99d3a8b9f5af6d82c5734c0e94c6ede67be Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 9 Mar 2012 01:56:37 +0000
Subject: [PATCH] - Fixed: UseInventory from ACS should ignore the totally
 frozen property.

SVN r3415 (trunk)
---
 src/p_acs.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index d8e45ba1ad..92d40bcb27 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -670,7 +670,22 @@ static bool DoUseInv (AActor *actor, const PClass *info)
 	AInventory *item = actor->FindInventory (info);
 	if (item != NULL)
 	{
-		return actor->UseInventory(item);
+		if (actor->player == NULL)
+		{
+			return actor->UseInventory(item);
+		}
+		else
+		{
+			int cheats;
+			bool res;
+
+			// Bypass CF_TOTALLYFROZEN
+			cheats = actor->player->cheats;
+			actor->player->cheats &= ~CF_TOTALLYFROZEN;
+			res = actor->UseInventory(item);
+			actor->player->cheats |= (cheats & CF_TOTALLYFROZEN);
+			return res;
+		}
 	}
 	return false;
 }