diff --git a/sp/src/game/client/c_basecombatweapon.cpp b/sp/src/game/client/c_basecombatweapon.cpp
index bdb71f02..3ae13cde 100644
--- a/sp/src/game/client/c_basecombatweapon.cpp
+++ b/sp/src/game/client/c_basecombatweapon.cpp
@@ -151,13 +151,6 @@ int C_BaseCombatWeapon::GetWorldModelIndex( void )
 //-----------------------------------------------------------------------------
 void C_BaseCombatWeapon::OnDataChanged( DataUpdateType_t updateType )
 {
-#ifdef MAPBASE
-	if (updateType == DATA_UPDATE_CREATED)
-	{
-		Precache();
-	}
-#endif // MAPBASE
-
 	BaseClass::OnDataChanged(updateType);
 
 	CHandle< C_BaseCombatWeapon > handle = this;
diff --git a/sp/src/game/client/mapbase/c_weapon_custom_hl2.cpp b/sp/src/game/client/mapbase/c_weapon_custom_hl2.cpp
index 71675b06..784ba9ea 100644
--- a/sp/src/game/client/mapbase/c_weapon_custom_hl2.cpp
+++ b/sp/src/game/client/mapbase/c_weapon_custom_hl2.cpp
@@ -23,6 +23,8 @@ public:
 
 	C_HLCustomWeaponMelee();
 
+	void OnDataChanged( DataUpdateType_t updateType );
+
 	virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; }
 private:
 	char m_iszWeaponScriptName[128];
@@ -39,6 +41,16 @@ C_HLCustomWeaponMelee::C_HLCustomWeaponMelee()
 	m_iszWeaponScriptName[0] = '\0';
 }
 
+void C_HLCustomWeaponMelee::OnDataChanged( DataUpdateType_t updateType )
+{
+	if (updateType == DATA_UPDATE_CREATED)
+	{
+		Precache();
+	}
+
+	BaseClass::OnDataChanged( updateType );
+}
+
 
 
 class C_HLCustomWeaponGun : public C_BaseHLCombatWeapon
@@ -50,6 +62,8 @@ public:
 
 	C_HLCustomWeaponGun();
 
+	void OnDataChanged( DataUpdateType_t updateType );
+
 	virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; }
 private:
 	char m_iszWeaponScriptName[128];
@@ -64,4 +78,14 @@ END_RECV_TABLE();
 C_HLCustomWeaponGun::C_HLCustomWeaponGun()
 {
 	m_iszWeaponScriptName[0] = '\0';
-}
\ No newline at end of file
+}
+
+void C_HLCustomWeaponGun::OnDataChanged( DataUpdateType_t updateType )
+{
+	if (updateType == DATA_UPDATE_CREATED)
+	{
+		Precache();
+	}
+
+	BaseClass::OnDataChanged( updateType );
+}
diff --git a/sp/src/game/shared/basecombatweapon_shared.cpp b/sp/src/game/shared/basecombatweapon_shared.cpp
index f7dc9d50..c67ab35a 100644
--- a/sp/src/game/shared/basecombatweapon_shared.cpp
+++ b/sp/src/game/shared/basecombatweapon_shared.cpp
@@ -164,9 +164,7 @@ void CBaseCombatWeapon::GiveDefaultAmmo( void )
 //-----------------------------------------------------------------------------
 void CBaseCombatWeapon::Spawn( void )
 {
-#if !defined(CLIENT_DLL) || !defined(MAPBASE)
 	Precache();
-#endif // !defined(CLIENT_DLL) || !defined(MAPBASE)
 
 	BaseClass::Spawn();