MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-04 17:50:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Swap clientside weapon precache back to fix ammo not showing up correctly on HUD

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2023-10-24 22:07:27 -05:00
parent 9591e92fa1
commit 8729bebe5f
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sp/src/game/client/c_basecombatweapon.cpp
View File

@ -151,13 +151,6 @@ int C_BaseCombatWeapon::GetWorldModelIndex( void )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void C_BaseCombatWeapon::OnDataChanged( DataUpdateType_t updateType ) void C_BaseCombatWeapon::OnDataChanged( DataUpdateType_t updateType )
{ {
#ifdef MAPBASE
if (updateType == DATA_UPDATE_CREATED)
{
Precache();
}
#endif // MAPBASE
BaseClass::OnDataChanged(updateType); BaseClass::OnDataChanged(updateType);
CHandle< C_BaseCombatWeapon > handle = this; CHandle< C_BaseCombatWeapon > handle = this;

26
sp/src/game/client/mapbase/c_weapon_custom_hl2.cpp
View File

@ -23,6 +23,8 @@ public:
C_HLCustomWeaponMelee(); C_HLCustomWeaponMelee();
void OnDataChanged( DataUpdateType_t updateType );
virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; } virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; }
private: private:
char m_iszWeaponScriptName[128]; char m_iszWeaponScriptName[128];
@ -39,6 +41,16 @@ C_HLCustomWeaponMelee::C_HLCustomWeaponMelee()
m_iszWeaponScriptName[0] = '\0'; 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 class C_HLCustomWeaponGun : public C_BaseHLCombatWeapon
@ -50,6 +62,8 @@ public:
C_HLCustomWeaponGun(); C_HLCustomWeaponGun();
void OnDataChanged( DataUpdateType_t updateType );
virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; } virtual const char* GetWeaponScriptName() { return m_iszWeaponScriptName; }
private: private:
char m_iszWeaponScriptName[128]; char m_iszWeaponScriptName[128];
@ -64,4 +78,14 @@ END_RECV_TABLE();
C_HLCustomWeaponGun::C_HLCustomWeaponGun() C_HLCustomWeaponGun::C_HLCustomWeaponGun()
{ {
m_iszWeaponScriptName[0] = '\0'; m_iszWeaponScriptName[0] = '\0';
} }
void C_HLCustomWeaponGun::OnDataChanged( DataUpdateType_t updateType )
{
if (updateType == DATA_UPDATE_CREATED)
{
Precache();
}
BaseClass::OnDataChanged( updateType );
}

2
sp/src/game/shared/basecombatweapon_shared.cpp
View File

@ -164,9 +164,7 @@ void CBaseCombatWeapon::GiveDefaultAmmo( void )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBaseCombatWeapon::Spawn( void ) void CBaseCombatWeapon::Spawn( void )
{ {
#if !defined(CLIENT_DLL) || !defined(MAPBASE)
Precache(); Precache();
#endif // !defined(CLIENT_DLL) || !defined(MAPBASE)
BaseClass::Spawn(); BaseClass::Spawn();