diff --git a/code/game/g_active.c b/code/game/g_active.c index b981fcf..2d21a93 100644 --- a/code/game/g_active.c +++ b/code/game/g_active.c @@ -1308,7 +1308,9 @@ void ClientEndFrame( gentity_t *ent ) { } // burn from lava, etc - P_WorldEffects (ent); + if ( g_worldDamage.integer ) { + P_WorldEffects (ent); + } // apply all the damage taken this frame P_DamageFeedback (ent); diff --git a/code/game/g_local.h b/code/game/g_local.h index a4f5ac7..5309147 100644 --- a/code/game/g_local.h +++ b/code/game/g_local.h @@ -1085,6 +1085,8 @@ extern vmCvar_t g_regen; // New in Illusion Arena r33 // Regenerating armor extern vmCvar_t g_regen_armor; +// New in Illusion Arena r42 +extern vmCvar_t g_worldDamage; //Free for all gametype extern int g_ffa_gt; //0 = TEAM GAME, 1 = FFA, 2 = TEAM GAME without bases diff --git a/code/game/g_main.c b/code/game/g_main.c index 2566fae..b6a141b 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -140,6 +140,8 @@ vmCvar_t g_regen; // New in Illusion Arena r33 // Regenerating armor vmCvar_t g_regen_armor; +// New in Illusion Arena r42 +vmCvar_t g_worldDamage; int g_ffa_gt; // Are this a FFA gametype even if gametype is high? vmCvar_t g_lms_lives; vmCvar_t g_lms_mode; @@ -361,6 +363,8 @@ static cvarTable_t gameCvarTable[] = { // New in Illusion Arena r33 // Regenerating armor { &g_regen_armor, "g_regen_armor", "0", CVAR_NORESTART, 0, qtrue }, + // New in Illusion Arena r42 + { &g_worldDamage, "g_worldDamage", "1", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART, 0, qtrue }, { &g_vampireMaxHealth, "g_vampire_max_health", "500", CVAR_NORESTART, 0, qtrue }, { &g_lms_lives, "g_lms_lives", "1", CVAR_NORESTART, 0, qtrue }, { &g_lms_mode, "g_lms_mode", "0", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART, 0, qtrue },