Add toggle for previous commit

rtcwmp-com · Sep 9, 2021 · 45c25e5 · 45c25e5
1 parent 88d3a43
commit 45c25e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/game/g_active.c b/src/game/g_active.c
@@ -1633,11 +1633,18 @@ void ClientThink_real( gentity_t *ent ) {
 	}
 
 
-	// use the precise origin for linking
-	VectorCopy( ent->client->ps.origin, ent->r.currentOrigin ); // RTCWPro - no snap origin, see above
-
-	// use the snapped origin for linking so it matches client predicted versions
-	//VectorCopy( ent->s.pos.trBase, ent->r.currentOrigin ); // RTCWPro - nope
+	// RTCWPro
+	if (!g_thinkSnapOrigin.integer) 
+	{
+		// use the precise origin for linking
+		VectorCopy(ent->client->ps.origin, ent->r.currentOrigin);
+	}
+	else
+	{
+		// use the snapped origin for linking so it matches client predicted versions
+		VectorCopy(ent->s.pos.trBase, ent->r.currentOrigin);
+	}
+	// RTCWPro
 
 	VectorCopy( pm.mins, ent->r.mins );
 	VectorCopy( pm.maxs, ent->r.maxs );

diff --git a/src/game/g_local.h b/src/game/g_local.h
@@ -1669,6 +1669,7 @@ extern vmCvar_t g_bodiesGrabFlags;
 extern vmCvar_t g_mapScriptDirectory;
 extern vmCvar_t g_thinkStateLevelTime;
 extern vmCvar_t g_endStateLevelTime;
+extern vmCvar_t g_thinkSnapOrigin;
 
 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
@@ -275,6 +275,7 @@ vmCvar_t g_bodiesGrabFlags;
 vmCvar_t g_mapScriptDirectory;
 vmCvar_t g_thinkStateLevelTime;
 vmCvar_t g_endStateLevelTime;
+vmCvar_t g_thinkSnapOrigin;
 
 cvarTable_t gameCvarTable[] = {
 	// don't override the cheat state set by the system
@@ -501,6 +502,7 @@ cvarTable_t gameCvarTable[] = {
 	{ &g_mapScriptDirectory, "g_mapScriptDirectory", "", 0, qfalse },
 	{ &g_damageRadiusKnockback, "g_damageRadiusKnockback", "1000", 0, 0, qtrue },
 	{ &g_thinkStateLevelTime, "g_thinkStateLevelTime", "1", CVAR_ARCHIVE | CVAR_LATCH, 0, qfalse },
+	{ &g_thinkSnapOrigin, "g_thinkSnapOrigin", "1", CVAR_ARCHIVE | CVAR_LATCH, 0, qfalse },
 	{ &g_endStateLevelTime, "g_endStateLevelTime", "1", CVAR_ARCHIVE | CVAR_LATCH, 0, qfalse },
 	{&stats_matchid, "stats_matchid", "None", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse},
 	{ &P, "P", "", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qfalse } // ET Port Players server info