zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed a few CCMDs which were blocked in the console.

This commit is contained in:
Christoph Oelckers 2020-10-12 19:48:47 +02:00
parent 742917c6d7
commit 20248d8e08
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blood/src/osdcmd.cpp
View File

@ -65,7 +65,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
static int osdcmd_third_person_view(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) if (gViewPos > VIEWPOS_0)
gViewPos = VIEWPOS_0; gViewPos = VIEWPOS_0;
else else
@ -75,7 +75,7 @@ static int osdcmd_third_person_view(CCmdFuncPtr parm)
static int osdcmd_coop_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) if (gGameOptions.nGameType == 1)
{ {
gViewIndex = connectpoint2[gViewIndex]; gViewIndex = connectpoint2[gViewIndex];
@ -101,7 +101,7 @@ static int osdcmd_coop_view(CCmdFuncPtr parm)
static int osdcmd_show_weapon(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; cl_showweapon = (cl_showweapon + 1) & 3;
return CCMD_OK; return CCMD_OK;
} }

2
source/exhumed/src/osdcmds.cpp
View File

@ -107,7 +107,7 @@ static int osdcmd_spawn(CCmdFuncPtr parm)
static int osdcmd_third_person_view(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) if (!nFreeze)
{ {
bCamera = !bCamera; bCamera = !bCamera;

6
source/games/duke/src/ccmds.cpp
View File

@ -127,7 +127,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
static int osdcmd_third_person_view(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 (!isRRRA() || (!ps[myconnectindex].OnMotorcycle && !ps[myconnectindex].OnBoat))
{ {
if (ps[myconnectindex].over_shoulder_on) 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) 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) if (ud.coop || ud.recstat == 2)
{ {
screenpeek = connectpoint2[screenpeek]; screenpeek = connectpoint2[screenpeek];
@ -156,7 +156,7 @@ static int osdcmd_coop_view(CCmdFuncPtr parm)
static int osdcmd_show_weapon(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) if (ud.multimode > 1)
{ {
ud.showweapons = 1 - ud.showweapons; ud.showweapons = 1 - ud.showweapons;

4
source/sw/src/osdcmds.cpp
View File

@ -102,7 +102,7 @@ static int osdcmd_mirror(CCmdFuncPtr parm)
static int osdcmd_third_person_view(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]; auto pp = &Player[myconnectindex];
if (inputState.ShiftPressed()) if (inputState.ShiftPressed())
{ {
@ -126,7 +126,7 @@ static int osdcmd_third_person_view(CCmdFuncPtr parm)
static int osdcmd_coop_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) if (gNet.MultiGameType == MULTI_GAME_COOPERATIVE)
{ {
screenpeek = connectpoint2[screenpeek]; screenpeek = connectpoint2[screenpeek];