mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Fix for AI seeking climb point in toxic gas
Fix for civilians trying to climb the roof to seek noise Fix for punching and stabbing Transparent change: Gave names to anonymous structs in OBJECTTYPE git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -3931,15 +3931,15 @@ BOOLEAN FireAShot( SOLDIERCELL *pAttacker )
|
||||
PlayAutoResolveSample( Weapon[ pItem->usItem ].sSound, RATE_11025, 50, 1, MIDDLEPAN );
|
||||
return TRUE;
|
||||
}
|
||||
if( !pItem->ubGunShotsLeft )
|
||||
if( !pItem->ItemData.Gun.ubGunShotsLeft )
|
||||
{
|
||||
AutoReload( pSoldier );
|
||||
if ( pItem->ubGunShotsLeft && Weapon[ pItem->usItem ].sLocknLoadSound )
|
||||
if ( pItem->ItemData.Gun.ubGunShotsLeft && Weapon[ pItem->usItem ].sLocknLoadSound )
|
||||
{
|
||||
PlayAutoResolveSample( Weapon[ pItem->usItem ].sLocknLoadSound, RATE_11025, 50, 1, MIDDLEPAN );
|
||||
}
|
||||
}
|
||||
if( pItem->ubGunShotsLeft )
|
||||
if( pItem->ItemData.Gun.ubGunShotsLeft )
|
||||
{
|
||||
PlayAutoResolveSample( Weapon[ pItem->usItem ].sSound, RATE_11025, 50, 1, MIDDLEPAN );
|
||||
if( pAttacker->uiFlags & CELL_MERC )
|
||||
@@ -3949,7 +3949,7 @@ BOOLEAN FireAShot( SOLDIERCELL *pAttacker )
|
||||
|
||||
StatChange( pAttacker->pSoldier, MARKAMT, 3, FALSE );
|
||||
}
|
||||
pItem->ubGunShotsLeft--;
|
||||
pItem->ItemData.Gun.ubGunShotsLeft--;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
@@ -3986,7 +3986,7 @@ BOOLEAN TargetHasLoadedGun( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
if( pItem->ubGunShotsLeft )
|
||||
if( pItem->ItemData.Gun.ubGunShotsLeft )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user