From 88a0d22f238637d6673926dbcf49ef7e5860185b Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Sun, 3 Mar 2013 19:12:21 +0000
Subject: [PATCH] - Fixed: Playing strife forced the inventory to be used
 immediately instead of being determined by the presence of an inventory
 overlay.

SVN r4173 (trunk)
---
 src/g_game.cpp               | 2 +-
 src/g_strife/strife_sbar.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/g_game.cpp b/src/g_game.cpp
index 48c4a3b7a..1f039763b 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -414,7 +414,7 @@ CCMD (invuseall)
 
 CCMD (invuse)
 {
-	if (players[consoleplayer].inventorytics == 0 || gameinfo.gametype == GAME_Strife)
+	if (players[consoleplayer].inventorytics == 0)
 	{
 		if (players[consoleplayer].mo) SendItemUse = players[consoleplayer].mo->InvSel;
 	}
diff --git a/src/g_strife/strife_sbar.cpp b/src/g_strife/strife_sbar.cpp
index 02db33d25..1a355b90a 100644
--- a/src/g_strife/strife_sbar.cpp
+++ b/src/g_strife/strife_sbar.cpp
@@ -445,6 +445,7 @@ private:
 		}
 
 		// Inventory
+		CPlayer->inventorytics = 0;
 		CPlayer->mo->InvFirst = ValidateInvFirst (6);
 		for (item = CPlayer->mo->InvFirst, i = 0; item != NULL && i < 6; item = item->NextInv(), ++i)
 		{