Skip to content
This repository was archived by the owner on May 25, 2024. It is now read-only.

Picking up weapons gives correct amount of ammo #93

Open
VantoNortim wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Picking up weapons gives correct amount of ammo #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb26557
Override default functionality of giving weapons to a player
VantoNortim May 3, 2024
94b0aef
Holstering a nade puts the pin back
VantoNortim May 3, 2024
2427788
Revert "Holstering a nade puts the pin back"
VantoNortim May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions mp/src/game/server/hl2mp/hl2mp_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,11 @@ void CHL2MP_Player::FireBullets ( const FireBulletsInfo_t &info )
lagcompensation->FinishLagCompensation( this );
}

void CHL2MP_Player::Weapon_Equip(CBaseCombatWeapon* pWeapon)
{
CHL2_Player::Weapon_Equip(pWeapon);
}

void CHL2MP_Player::NoteWeaponFired( void )
{
Assert( m_pCurrentCommand );
Expand Down
1 change: 1 addition & 0 deletions mp/src/game/server/hl2mp/hl2mp_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class CHL2MP_Player : public CHL2_Player
virtual int OnTakeDamage( const CTakeDamageInfo &inputInfo );
virtual bool WantsLagCompensationOnEntity( const CBasePlayer *pPlayer, const CUserCmd *pCmd, const CBitVec<MAX_EDICTS> *pEntityTransmitBits ) const;
virtual void FireBullets ( const FireBulletsInfo_t &info );
virtual void Weapon_Equip(CBaseCombatWeapon* pWeapon) override;
virtual bool Weapon_Switch( CBaseCombatWeapon *pWeapon, int viewmodelindex = 0);
virtual bool BumpWeapon( CBaseCombatWeapon *pWeapon );
virtual void ChangeTeam( int iTeam );
Expand Down
41 changes: 40 additions & 1 deletion mp/src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,8 +1446,47 @@ void CNEO_Player::FireBullets ( const FireBulletsInfo_t &info )
BaseClass::FireBullets(info);
}

void CNEO_Player::Weapon_Equip(CBaseCombatWeapon* pWeapon)
{
for (int i=0;i<MAX_WEAPONS;i++)
{
if (!m_hMyWeapons[i])
{
m_hMyWeapons.Set( i, pWeapon );
break;
}
}

pWeapon->ChangeTeam( GetTeamNumber() );

if (pWeapon->GetMaxClip1() == -1)
{
GiveAmmo(pWeapon->GetDefaultClip1(), pWeapon->m_iPrimaryAmmoType, false);
}
else if(pWeapon->m_iClip1 > pWeapon->GetMaxClip1())
{
pWeapon->m_iClip1 = pWeapon->GetMaxClip1();
GiveAmmo( pWeapon->GetDefaultClip1() - pWeapon->GetMaxClip1(), pWeapon->m_iPrimaryAmmoType, false);
}

if (pWeapon->GetMaxClip2() == -1)
{
GiveAmmo(pWeapon->GetDefaultClip2(), pWeapon->m_iSecondaryAmmoType, false);
}
else if(pWeapon->m_iClip2 > pWeapon->GetMaxClip2())
{
pWeapon->m_iClip2 = pWeapon->GetMaxClip2();
GiveAmmo( pWeapon->GetDefaultClip2() - pWeapon->GetMaxClip2(), pWeapon->m_iSecondaryAmmoType, false);
}

pWeapon->Equip( this );

// Pass the lighting origin over to the weapon if we have one
pWeapon->SetLightingOriginRelative( GetLightingOriginRelative() );
}

bool CNEO_Player::Weapon_Switch( CBaseCombatWeapon *pWeapon,
int viewmodelindex )
int viewmodelindex )
{
ShowCrosshair(false);

Expand Down
1 change: 1 addition & 0 deletions mp/src/game/server/neo/neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class CNEO_Player : public CHL2MP_Player
virtual float GetReceivedDamageScale(CBaseEntity* pAttacker) OVERRIDE;
virtual bool WantsLagCompensationOnEntity(const CBasePlayer *pPlayer, const CUserCmd *pCmd, const CBitVec<MAX_EDICTS> *pEntityTransmitBits) const OVERRIDE;
virtual void FireBullets(const FireBulletsInfo_t &info) OVERRIDE;
virtual void Weapon_Equip(CBaseCombatWeapon* pWeapon) OVERRIDE;
virtual bool Weapon_Switch(CBaseCombatWeapon *pWeapon, int viewmodelindex = 0) OVERRIDE;
virtual bool Weapon_CanSwitchTo(CBaseCombatWeapon *pWeapon) OVERRIDE;
virtual bool BumpWeapon(CBaseCombatWeapon *pWeapon) OVERRIDE;
Expand Down