diff options
| author | IronClawTrem <louie.nutman@gmail.com> | 2020-03-07 21:33:44 +0000 |
|---|---|---|
| committer | IronClawTrem <louie.nutman@gmail.com> | 2020-03-07 21:54:56 +0000 |
| commit | ca8a08351aeca3a7e27196941bae54cb00a57f72 (patch) | |
| tree | 0f278f2420fec6a66291627ce03cab2e644ae88b | |
| parent | dfb61191ce637adcff4129e5edef0484ec6338b7 (diff) | |
properly remove building for practise mode
| -rw-r--r-- | src/game/g_cmds.c | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 1448e12..3e5c8ba 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2780,8 +2780,7 @@ void Cmd_Class_f( gentity_t *ent ) return; } - if( ent->client->pers.denyBuild && ( newClass==PCL_ALIEN_BUILDER0 || newClass==PCL_ALIEN_BUILDER0_UPG ) - || g_practise.integer && ( newClass==PCL_ALIEN_BUILDER0 || newClass==PCL_ALIEN_BUILDER0_UPG ) ) + if( ent->client->pers.denyBuild && ( newClass==PCL_ALIEN_BUILDER0 || newClass==PCL_ALIEN_BUILDER0_UPG ) ) { trap_SendServerCommand( ent-g_entities, "print \"Your building rights have been revoked\n\"" ); return; @@ -2805,22 +2804,12 @@ void Cmd_Class_f( gentity_t *ent ) else if( !Q_stricmp( s, BG_FindNameForWeapon( WP_HBUILD ) ) && BG_WeaponIsAllowed( WP_HBUILD ) ) { - if( g_practise.integer ) - { - trap_SendServerCommand( ent-g_entities, "print \"Your building rights have been revoked\n\"" ); - return; - } ent->client->pers.humanItemSelection = WP_HBUILD; } else if( !Q_stricmp( s, BG_FindNameForWeapon( WP_HBUILD2 ) ) && BG_WeaponIsAllowed( WP_HBUILD2 ) && BG_FindStagesForWeapon( WP_HBUILD2, g_humanStage.integer ) ) { - if( g_practise.integer ) - { - trap_SendServerCommand( ent-g_entities, "print \"Your building rights have been revoked\n\"" ); - return; - } ent->client->pers.humanItemSelection = WP_HBUILD2; } else @@ -3044,6 +3033,13 @@ void Cmd_Destroy_f( gentity_t *ent ) return; } + if( g_practise.integer ) + { + trap_SendServerCommand( ent-g_entities, + "print \"You cannot build in practise mode\n\"" ); + return; + } + trap_Argv( 0, cmd, sizeof( cmd ) ); if( Q_stricmp( cmd, "destroy" ) == 0 ) deconstruct = qfalse; @@ -3219,6 +3215,13 @@ void Cmd_Mark_f( gentity_t *ent ) return; } + if( g_practise.integer ) + { + trap_SendServerCommand( ent-g_entities, + "print \"You cannot build in practise mode\n\"" ); + return; + } + // Check the minimum level to deconstruct if ( G_admin_level( ent ) < g_minDeconLevel.integer && !ent->client->pers.designatedBuilder && g_minDeconAffectsMark.integer > 0 ) { @@ -3793,6 +3796,7 @@ void Cmd_Build_f( gentity_t *ent ) "print \"Your building rights have been revoked\n\"" ); return; } + if( ent->client->pers.paused ) { trap_SendServerCommand( ent-g_entities, @@ -3800,6 +3804,13 @@ void Cmd_Build_f( gentity_t *ent ) return; } + if( g_practise.integer ) + { + trap_SendServerCommand( ent-g_entities, + "print \"You cannot build in practise mode\n\"" ); + return; + } + trap_Argv( 1, s, sizeof( s ) ); buildable = BG_FindBuildNumForName( s ); |