From 6c3a5da19dedfb2cc17970bca31817c59d44d682 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Mon, 10 Oct 2016 18:52:07 +0300
Subject: [PATCH] Remove uneeded stubs, will be inlined now

---
 cl_dll/com_weapons.cpp       | 25 -------------------------
 cl_dll/cs_wpn/cs_weapons.cpp |  6 +-----
 cl_dll/include/com_weapons.h |  7 +------
 dlls/enginecallback.h        |  8 +++++++-
 dlls/wpn_shared/wpn_c4.cpp   |  2 +-
 5 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/cl_dll/com_weapons.cpp b/cl_dll/com_weapons.cpp
index 9d27661..41da0fb 100644
--- a/cl_dll/com_weapons.cpp
+++ b/cl_dll/com_weapons.cpp
@@ -157,17 +157,6 @@ void HUD_PlaybackEvent( int flags, const edict_t *pInvoker, unsigned short event
 								bparam1, bparam2 );
 }
 
-/*
-=====================
-HUD_SetMaxSpeed
-
-=====================
-*/
-void HUD_SetMaxSpeed( const edict_t *ed, float speed )
-{
-}
-
-
 /*
 =====================
 UTIL_WeaponTimeBase
@@ -281,17 +270,3 @@ float UTIL_SharedRandomFloat( unsigned int seed, float low, float high )
 		return (low + offset * range );
 	}
 }
-
-
-/*
-======================
-stub_*
-
-stub functions for such things as precaching.  So we don't have to modify weapons code that
- is compiled into both game and client .dlls.
-======================
-*/
-int				stub_PrecacheModel		( const char* s ) { return 0; }
-int				stub_PrecacheSound		( const char* s ) { return 0; }
-const char		*stub_NameForFunction	( unsigned int function ) { return "func"; }
-void			stub_SetModel			( edict_t *e, const char *m ) {}
diff --git a/cl_dll/cs_wpn/cs_weapons.cpp b/cl_dll/cs_wpn/cs_weapons.cpp
index a11b662..b1bbe18 100644
--- a/cl_dll/cs_wpn/cs_weapons.cpp
+++ b/cl_dll/cs_wpn/cs_weapons.cpp
@@ -877,11 +877,7 @@ void HUD_InitClientWeapons( void )
 	gpGlobals->time = gEngfuncs.GetClientTime();
 
 	// Fake functions
-	g_engfuncs.pfnPrecacheModel		= stub_PrecacheModel;
-	g_engfuncs.pfnPrecacheSound		= stub_PrecacheSound;
-	g_engfuncs.pfnNameForFunction	= stub_NameForFunction;
-	g_engfuncs.pfnSetModel			= stub_SetModel;
-	g_engfuncs.pfnSetClientMaxspeed = HUD_SetMaxSpeed;
+	//g_engfuncs.pfnSetClientMaxspeed = HUD_SetMaxSpeed;
 
 	// Handled locally
 	g_engfuncs.pfnPlaybackEvent		= HUD_PlaybackEvent;
diff --git a/cl_dll/include/com_weapons.h b/cl_dll/include/com_weapons.h
index e1a958f..7db2e86 100644
--- a/cl_dll/include/com_weapons.h
+++ b/cl_dll/include/com_weapons.h
@@ -51,12 +51,7 @@ void			HUD_SendWeaponAnim(int iAnim, int iWeaponId, int iBody, int iForce = 0 );
 int				HUD_GetWeapon( void );
 void			HUD_PlaySound( char *sound, float volume );
 void			HUD_PlaybackEvent( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
-void			HUD_SetMaxSpeed( const struct edict_s *ed, float speed );
-int				stub_PrecacheModel( const char* s );
-int				stub_PrecacheSound( const char* s );
-unsigned short	stub_PrecacheEvent( int type, const char *s );
-const char		*stub_NameForFunction	( unsigned int function );
-void			stub_SetModel			( struct edict_s *e, const char *m );
+//void			HUD_SetMaxSpeed( const struct edict_s *ed, float speed );
 int				GetWeaponAccuracyFlags( int weaponid );
 
 extern cvar_t *cl_lw;
diff --git a/dlls/enginecallback.h b/dlls/enginecallback.h
index 4a7b582..edbb914 100644
--- a/dlls/enginecallback.h
+++ b/dlls/enginecallback.h
@@ -27,10 +27,16 @@ extern enginefuncs_t g_engfuncs;
 
 // The actual engine callbacks
 #define GETPLAYERUSERID (*g_engfuncs.pfnGetPlayerUserId)
+#define PRECACHE_GENERIC	(*g_engfuncs.pfnPrecacheGeneric)
+#ifdef CLIENT_DLL
+inline int PRECACHE_MODEL( const char *s ) { return 0; }
+inline int PRECACHE_SOUND( const char *s ) { return 0; }
+#define SET_MODEL(x, y)
+#else
 #define PRECACHE_MODEL	(*g_engfuncs.pfnPrecacheModel)
 #define PRECACHE_SOUND	(*g_engfuncs.pfnPrecacheSound)
-#define PRECACHE_GENERIC	(*g_engfuncs.pfnPrecacheGeneric)
 #define SET_MODEL		(*g_engfuncs.pfnSetModel)
+#endif
 #define MODEL_INDEX		(*g_engfuncs.pfnModelIndex)
 #define MODEL_FRAMES	(*g_engfuncs.pfnModelFrames)
 #define SET_SIZE		(*g_engfuncs.pfnSetSize)
diff --git a/dlls/wpn_shared/wpn_c4.cpp b/dlls/wpn_shared/wpn_c4.cpp
index 8afcba1..bf63a4b 100644
--- a/dlls/wpn_shared/wpn_c4.cpp
+++ b/dlls/wpn_shared/wpn_c4.cpp
@@ -147,13 +147,13 @@ void CC4::PrimaryAttack(void)
 			m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1;
 			return;
 		}
-		g_engfuncs.pfnSetClientMaxspeed(ENT(m_pPlayer->pev), 1);
 #endif
 		m_bStartedArming = true;
 		m_bBombPlacedAnimation = false;
 		m_fArmedTime = gpGlobals->time + 3;
 		SendWeaponAnim(C4_ARM, UseDecrement() != FALSE);
 #ifndef CLIENT_DLL
+		g_engfuncs.pfnSetClientMaxspeed(ENT(m_pPlayer->pev), 1);
 		m_pPlayer->SetAnimation(PLAYER_ATTACK1);
 		m_pPlayer->SetProgressBarTime(3);
 #endif