Add cvar for disabling the fix for the borg1 freeze

Might be wanted as it is fun to show off at marathons or similar
kugelrund · Jun 2, 2018 · d17fbe4 · d17fbe4
1 parent 051ab36
commit d17fbe4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/game/g_active.cpp b/game/g_active.cpp
@@ -244,9 +244,11 @@ void	G_TouchTriggersLerped( gentity_t *ent ) {
 		return;
 	}
 
-	// let us not have an infinite loop
-	if ( ent->maxs[1] <= 0.0 ) {
-		return;
+	if ( g_fixFreezeBorg1->integer ) {
+		// let us not have an infinite loop
+		if (ent->maxs[1] <= 0.0) {
+			return;
+		}
 	}
 
 	VectorSubtract( ent->currentOrigin, ent->lastOrigin, diff );

diff --git a/game/g_local.h b/game/g_local.h
@@ -178,6 +178,7 @@ extern	cvar_t	*g_virtualVoyager;
 
 // new additions for Elite Reinforce
 extern	cvar_t	*g_teamKnockback;
+extern	cvar_t	*g_fixFreezeBorg1;
 
 //
 // g_spawn.c

diff --git a/game/g_main.cpp b/game/g_main.cpp
@@ -41,6 +41,7 @@ cvar_t	*g_virtualVoyager;
 // new additions for Elite Reinforce
 cvar_t	*g_skipDialogs;
 cvar_t	*g_teamKnockback;
+cvar_t	*g_fixFreezeBorg1;
 
 qboolean	stop_icarus = qfalse;
 
@@ -163,6 +164,7 @@ void G_InitCvars( void ) {
 	// new additions for Elite Reinforce
 	g_skipDialogs = gi.cvar( "g_skipDialogs", "0", CVAR_ARCHIVE );
 	g_teamKnockback = gi.cvar( "g_teamKnockback", "0", CVAR_CHEAT );
+	g_fixFreezeBorg1 = gi.cvar( "g_fixFreezeBorg1", "1", CVAR_ARCHIVE );
 }
 
 /*