Merge pull request #1582 from JoelTroch/master

Minor fix for CBasePlayerWeapon::ExtractAmmo
master
alfred-valve 2014-12-30 19:34:56 -08:00
commit 9fd5815181
3 changed files with 3 additions and 3 deletions

View File

@ -1139,7 +1139,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
//=========================================================
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
{
int iReturn;
int iReturn = 0;
if ( pszAmmo1() != NULL )
{

View File

@ -1036,7 +1036,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
//=========================================================
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
{
int iReturn;
int iReturn = 0;
if ( pszAmmo1() != NULL )
{

View File

@ -1003,7 +1003,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
//=========================================================
int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
{
int iReturn;
int iReturn = 0;
if ( pszAmmo1() != NULL )
{