summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIronClawTrem <louie.nutman@gmail.com>2020-03-29 18:26:03 +0100
committerIronClawTrem <louie.nutman@gmail.com>2020-03-29 18:26:03 +0100
commit7a91f404c1cd014ce3f98068c8dc88d7caaa2a6b (patch)
treee2408139da89c5e84227a76de5cd6340bfca43fc
parent4d46255e2317a9febdf36368496fa958056883e2 (diff)
make der bunker's rant nerf a cvar
-rw-r--r--src/game/g_local.h1
-rw-r--r--src/game/g_main.c4
-rw-r--r--src/game/g_weapon.c5
3 files changed, 8 insertions, 2 deletions
diff --git a/src/game/g_local.h b/src/game/g_local.h
index ded4d63..baf69ee 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -1505,6 +1505,7 @@ extern vmCvar_t g_adminAutobahnNotify;
extern vmCvar_t g_maxGhosts;
extern vmCvar_t g_specNoclip;
extern vmCvar_t g_practise;
+extern vmCvar_t g_tyrantNerf;
void trap_Printf( const char *fmt );
void trap_Error( const char *fmt );
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 9bf9b38..c6b9344 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -246,6 +246,7 @@ vmCvar_t g_adminAutobahnNotify;
vmCvar_t g_maxGhosts;
vmCvar_t g_specNoclip;
vmCvar_t g_practise;
+vmCvar_t g_tyrantNerf;
static cvarTable_t gameCvarTable[ ] =
{
@@ -471,7 +472,8 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_adminAutobahnNotify, "g_adminAutobahnNotify", "1", CVAR_ARCHIVE, 0, qfalse },
{ &g_maxGhosts, "g_maxGhosts", "0", CVAR_ARCHIVE, 0, qfalse },
{ &g_specNoclip, "g_specNoclip", "0", CVAR_ARCHIVE, 0, qtrue },
- { &g_practise, "g_practise", "0", CVAR_ARCHIVE, 0, qfalse }
+ { &g_practise, "g_practise", "0", CVAR_ARCHIVE, 0, qfalse },
+ { &g_tyrantNerf, "g_tyrantNerf", "0", CVAR_ARCHIVE, 0, qfalse },
};
static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[ 0 ] );
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index e50594a..0a72a7e 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -1585,7 +1585,10 @@ void FireWeapon( gentity_t *ent )
meleeAttack( ent, LEVEL2_CLAW_RANGE * ( newRange->rangeBoost + 1.0f ), LEVEL2_CLAW_WIDTH, LEVEL2_CLAW_DMG, MOD_LEVEL2_CLAW );
break;
case WP_ALEVEL4:
- meleeAttack( ent, LEVEL4_CLAW_RANGE * ( newRange->rangeBoost + 1.0f ), LEVEL4_CLAW_WIDTH, LEVEL4_CLAW_DMG, MOD_LEVEL4_CLAW );
+ if( g_tyrantNerf.integer )
+ meleeAttack( ent, ( LEVEL4_CLAW_RANGE * ( newRange->rangeBoost + 1.0f ) ) , LEVEL4_CLAW_WIDTH - 4, LEVEL4_CLAW_DMG, MOD_LEVEL4_CLAW );
+ else
+ meleeAttack( ent, LEVEL4_CLAW_RANGE * ( newRange->rangeBoost + 1.0f ), LEVEL4_CLAW_WIDTH, LEVEL4_CLAW_DMG, MOD_LEVEL4_CLAW );
break;
case WP_BLASTER: