mirror of
https://github.com/ValveSoftware/halflife.git
synced 2025-01-13 07:08:06 +03:00
Merge pull request #1582 from JoelTroch/master
Minor fix for CBasePlayerWeapon::ExtractAmmo
This commit is contained in:
commit
9fd5815181
@ -1139,7 +1139,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
|
|||||||
//=========================================================
|
//=========================================================
|
||||||
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
||||||
{
|
{
|
||||||
int iReturn;
|
int iReturn = 0;
|
||||||
|
|
||||||
if ( pszAmmo1() != NULL )
|
if ( pszAmmo1() != NULL )
|
||||||
{
|
{
|
||||||
|
@ -1036,7 +1036,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
|
|||||||
//=========================================================
|
//=========================================================
|
||||||
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
||||||
{
|
{
|
||||||
int iReturn;
|
int iReturn = 0;
|
||||||
|
|
||||||
if ( pszAmmo1() != NULL )
|
if ( pszAmmo1() != NULL )
|
||||||
{
|
{
|
||||||
|
@ -1003,7 +1003,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
|
|||||||
//=========================================================
|
//=========================================================
|
||||||
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
|
||||||
{
|
{
|
||||||
int iReturn;
|
int iReturn = 0;
|
||||||
|
|
||||||
if ( pszAmmo1() != NULL )
|
if ( pszAmmo1() != NULL )
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user