Merge branch 'master' into new_level_refactor
# Conflicts: # src/c_dispatch.cpp
This commit is contained in:
commit
22939aade7
9 changed files with 133 additions and 138 deletions
|
|
@ -74,6 +74,7 @@ extern bool insave;
|
|||
|
||||
CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH)
|
||||
CVAR (Bool, sv_unlimited_pickup, false, CVAR_SERVERINFO)
|
||||
CVAR (Bool, cl_blockcheats, false, 0)
|
||||
|
||||
CCMD (toggleconsole)
|
||||
{
|
||||
|
|
@ -87,6 +88,11 @@ bool CheckCheatmode (bool printmsg)
|
|||
if (printmsg) Printf ("sv_cheats must be true to enable this command.\n");
|
||||
return true;
|
||||
}
|
||||
else if (cl_blockcheats)
|
||||
{
|
||||
if (printmsg) Printf ("cl_blockcheats is turned on and disabled this command.\n");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue