From 20248d8e08beb56ddf1f3610ced35dcff4b8ec2d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Oct 2020 19:48:47 +0200
Subject: [PATCH] - fixed a few CCMDs which were blocked in the console.

---
 source/blood/src/osdcmd.cpp     | 6 +++---
 source/exhumed/src/osdcmds.cpp  | 2 +-
 source/games/duke/src/ccmds.cpp | 6 +++---
 source/sw/src/osdcmds.cpp       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/blood/src/osdcmd.cpp b/source/blood/src/osdcmd.cpp
index dcd7e5cad..bab85c9e9 100644
--- a/source/blood/src/osdcmd.cpp
+++ b/source/blood/src/osdcmd.cpp
@@ -65,7 +65,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
 
 static int osdcmd_third_person_view(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     if (gViewPos > VIEWPOS_0)
         gViewPos = VIEWPOS_0;
     else
@@ -75,7 +75,7 @@ static int osdcmd_third_person_view(CCmdFuncPtr parm)
 
 static int osdcmd_coop_view(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     if (gGameOptions.nGameType == 1)
     {
         gViewIndex = connectpoint2[gViewIndex];
@@ -101,7 +101,7 @@ static int osdcmd_coop_view(CCmdFuncPtr parm)
 
 static int osdcmd_show_weapon(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     cl_showweapon = (cl_showweapon + 1) & 3;
     return CCMD_OK;
 }
diff --git a/source/exhumed/src/osdcmds.cpp b/source/exhumed/src/osdcmds.cpp
index eef22a001..1ae6f36f3 100644
--- a/source/exhumed/src/osdcmds.cpp
+++ b/source/exhumed/src/osdcmds.cpp
@@ -107,7 +107,7 @@ static int osdcmd_spawn(CCmdFuncPtr parm)
 
 static int osdcmd_third_person_view(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     if (!nFreeze)
     {
         bCamera = !bCamera;
diff --git a/source/games/duke/src/ccmds.cpp b/source/games/duke/src/ccmds.cpp
index bd5c83bd1..6608bc810 100644
--- a/source/games/duke/src/ccmds.cpp
+++ b/source/games/duke/src/ccmds.cpp
@@ -127,7 +127,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
 
 static int osdcmd_third_person_view(CCmdFuncPtr parm)
 {
-	if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+	if (gamestate != GS_LEVEL) return CCMD_OK;
 	if (!isRRRA() || (!ps[myconnectindex].OnMotorcycle && !ps[myconnectindex].OnBoat))
 	{
 		if (ps[myconnectindex].over_shoulder_on)
@@ -145,7 +145,7 @@ static int osdcmd_third_person_view(CCmdFuncPtr parm)
 
 static int osdcmd_coop_view(CCmdFuncPtr parm)
 {
-	if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+	if (gamestate != GS_LEVEL) return CCMD_OK;
 	if (ud.coop || ud.recstat == 2)
 	{
 		screenpeek = connectpoint2[screenpeek];
@@ -156,7 +156,7 @@ static int osdcmd_coop_view(CCmdFuncPtr parm)
 
 static int osdcmd_show_weapon(CCmdFuncPtr parm)
 {
-	if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+	if (gamestate != GS_LEVEL) return CCMD_OK;
 	if (ud.multimode > 1)
 	{
 		ud.showweapons = 1 - ud.showweapons;
diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp
index 9d5e3bf1a..fd98ca6db 100644
--- a/source/sw/src/osdcmds.cpp
+++ b/source/sw/src/osdcmds.cpp
@@ -102,7 +102,7 @@ static int osdcmd_mirror(CCmdFuncPtr parm)
 
 static int osdcmd_third_person_view(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     auto pp = &Player[myconnectindex];
     if (inputState.ShiftPressed())
     {
@@ -126,7 +126,7 @@ static int osdcmd_third_person_view(CCmdFuncPtr parm)
 
 static int osdcmd_coop_view(CCmdFuncPtr parm)
 {
-    if (gamestate != GS_LEVEL || System_WantGuiCapture()) return CCMD_OK;
+    if (gamestate != GS_LEVEL) return CCMD_OK;
     if (gNet.MultiGameType == MULTI_GAME_COOPERATIVE)
     {
         screenpeek = connectpoint2[screenpeek];