Don't precache CTF related resources (CTF is not implemented properly).

Fix #406 (#414) Remove gearbox_client.cpp and other unused files
FWGS · Dec 23, 2023 · 033f23a · 033f23a
1 parent 8bd8e16
commit 033f23a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 2,249 deletions.
diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
@@ -47,7 +47,6 @@ set (SVDLL_SOURCES
 	gearbox/eagle.cpp
 	gearbox/fgrunt.cpp
 	gearbox/func_tank_of.cpp
-#	gearbox/gearbox_client.cpp
 	gearbox/gearbox_effects.cpp
 	gearbox/gearbox_triggers.cpp
 	gearbox/gearbox_utils.cpp

diff --git a/dlls/client.cpp b/dlls/client.cpp
@@ -941,28 +941,6 @@ void ClientPrecache( void )
 
 	// Teleport sounds. Used by trigger_xen_return
 	PRECACHE_SOUND( "debris/beamstart7.wav" );
-
-	PRECACHE_MODEL( "models/flag.mdl" );
-	PRECACHE_MODEL( "models/civ_stand.mdl" );
-	PRECACHE_MODEL( "models/mil_stand.mdl" );
-
-	PRECACHE_MODEL( "models/w_accelerator.mdl" );
-	PRECACHE_MODEL( "models/w_backpack.mdl" );
-	PRECACHE_MODEL( "models/w_fgrenade.mdl" );
-	PRECACHE_MODEL( "models/w_health.mdl" );
-	PRECACHE_MODEL( "models/w_icon.mdl" );
-	PRECACHE_MODEL( "models/w_jumppack.mdl" );
-	PRECACHE_MODEL( "models/w_porthev.mdl" );
-
-	PRECACHE_SOUND( "ctf/bm_flagtaken.wav" );
-	PRECACHE_SOUND( "ctf/civ_flag_capture.wav" );
-	PRECACHE_SOUND( "ctf/itemthrow.wav" );
-	PRECACHE_SOUND( "ctf/marine_flag_capture.wav" );
-	PRECACHE_SOUND( "ctf/pow_armor_charge.wav" );
-	PRECACHE_SOUND( "ctf/pow_backpack.wav" );
-	PRECACHE_SOUND( "ctf/pow_big_jump.wav" );
-	PRECACHE_SOUND( "ctf/pow_health_charge.wav" );
-	PRECACHE_SOUND( "ctf/soldier_flagtaken.wav" );
 }
 
 /*

diff --git a/dlls/gearbox/ctf_gamerules.cpp b/dlls/gearbox/ctf_gamerules.cpp
@@ -200,8 +200,8 @@ void CCTFMultiplay::Think(void)
 		frags_remaining = bestfrags;
 	}
 
-	if (!g_bSpawnedRunes)
-		SpawnRunes();
+	//if (!g_bSpawnedRunes)
+	//	SpawnRunes();
 
 	if (m_flFlagStatusTime && m_flFlagStatusTime <= gpGlobals->time)
 		GetFlagStatus(NULL);

diff --git a/dlls/gearbox/ctf_powerups.cpp b/dlls/gearbox/ctf_powerups.cpp
@@ -114,12 +114,18 @@ void CPowerupCTFBase::Spawn(void)
 			m_iszPrintName = ALLOC_STRING(printname);
 		}
 
-
-		SET_MODEL(ENT(pev), SelectRuneRandom(&m_iRuneFlag) );
+		PRECACHE_MODEL("models/w_accelerator.mdl");
+		PRECACHE_MODEL("models/w_backpack.mdl");
+		PRECACHE_MODEL("models/w_health.mdl");
+		PRECACHE_MODEL("models/w_jumppack.mdl");
+		PRECACHE_MODEL("models/w_porthev.mdl");
+		SET_MODEL(ENT(pev), modelname);
 	}
 	else
 	{
-		SET_MODEL(ENT(pev), GetRuneModel());
+		const char* modelname = GetRuneModel();
+		PRECACHE_MODEL(modelname);
+		SET_MODEL(ENT(pev), modelname);
 		m_iRuneFlag = GetRuneFlag();
 	}