Skip to content

Sandbox allowed noclip #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0bama272 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sandbox allowed noclip #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions src/game/server/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "client.h"
#include "soundent.h"
#include "gamerules.h"
#include "jbmod_gamerules.h"
#include "game.h"
#include "physics.h"
#include "entitylist.h"
Expand Down Expand Up @@ -1158,6 +1159,11 @@ static int FindPassableSpace( CBasePlayer *pPlayer, const Vector& direction, flo
//------------------------------------------------------------------------------
// Noclip
//------------------------------------------------------------------------------

ConVar sandbox_restrict_noclip_to_admins("sandbox_restrict_noclip_to_admins","0",FCVAR_NOTIFY, "If enabled, only admins can use noclip in sandbox mode.");



void EnableNoClip( CBasePlayer *pPlayer )
{
// Disengage from hierarchy
Expand All @@ -1169,10 +1175,26 @@ void EnableNoClip( CBasePlayer *pPlayer )

void CC_Player_NoClip( void )
{
if ( !sv_cheats->GetBool() )
return;
bool bSandboxGamemode = false;

CBasePlayer *pPlayer = ToBasePlayer( UTIL_GetCommandClient() );
if (JBModRules())
bSandboxGamemode = !Q_stricmp(JBModRules()->m_szGameMode, "sandbox");

if (bSandboxGamemode)
{
if (sandbox_restrict_noclip_to_admins.GetBool())
{
if (!UTIL_IsCommandIssuedByServerAdmin())
return;
}
}
else
{
if (!sv_cheats->GetBool())
return;
}

CBasePlayer* pPlayer = ToBasePlayer(UTIL_GetCommandClient());
if ( !pPlayer )
return;

Expand Down Expand Up @@ -1221,7 +1243,7 @@ void CC_Player_NoClip( void )
}
}

static ConCommand noclip("noclip", CC_Player_NoClip, "Toggle. Player becomes non-solid and flies.", FCVAR_CHEAT);
static ConCommand noclip("noclip", CC_Player_NoClip, "Toggle. Player becomes non-solid and flies.");


//------------------------------------------------------------------------------
Expand Down