1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Play grenade pin sound (supports custom grenade pin sound with <sSound> tag in Weapons.xml)

Browse Source 
Help AI associate noise with enemy presence: 
- melee attack noise type changed to NOISE_BULLET_IMPACT
- HTH attack noise type changed to NOISE_BULLET_IMPACT
- grenade pin noise type changed to NOISE_GRENADE_IMPACT
- launcher attack noise type changed to NOISE_GUNFIRE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-01-11 17:15:17 +00:00
parent 6386338422
commit f54a91718b
7 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+80
View File
@@ -1055,6 +1055,7 @@ SOLDIERTYPE& SOLDIERTYPE::operator=(const OLDSOLDIERTYPE_101& src)
this->usQuickItemId = 0;
this->ubQuickItemSlot = 0;
this->usGrenadeItem = 0;
}
return *this;
}
@@ -2980,6 +2981,85 @@ BOOLEAN SOLDIERTYPE::EVENT_InitNewSoldierAnim( UINT16 usNewState, UINT16 usStart
// DO SOME CHECKS ON OUR NEW ANIMATION!
/////////////////////////////////////////////////////////////////////
if (usNewState == THROW_GRENADE_STANCE || usNewState == LOB_GRENADE_STANCE || usNewState == THROW_ITEM || usNewState == THROW_ITEM_CROUCHED)
{
UINT16 usItem = this->usGrenadeItem;
UINT8 ubVolume = Weapon[usItem].ubAttackVolume;
// play grenade pin sound
if (usItem && Item[usItem].usItemClass == IC_GRENADE)
{
CHAR8 zFilename[512];
sprintf(zFilename, "");
BOOLEAN fDelay = FALSE;
if (usNewState == THROW_GRENADE_STANCE && gAnimControl[this->usAnimState].ubEndHeight == ANIM_STAND && this->ubBodyType < REGFEMALE)
{
fDelay = TRUE;
}
// check if custom sound is set in Weapons.xml
if (Weapon[usItem].sSound)
{
PlayJA2Sample(Weapon[Item[usItem].ubClassIndex].sSound, RATE_11025, SoundVolume(MIDVOLUME, this->sGridNo), 1, SoundDir(this->sGridNo));
}
else
{
if (Item[usItem].flare ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_SIGNAL_SMOKE ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_FLARE)
{
if (usItem == BREAK_LIGHT)
{
if (fDelay)
sprintf(zFilename, "sounds\\grenade\\grenade_breaklight_delay.ogg");
else
sprintf(zFilename, "sounds\\grenade\\grenade_breaklight.ogg");
}
else
{
if (fDelay)
sprintf(zFilename, "sounds\\grenade\\grenade_flare_delay.ogg");
else
sprintf(zFilename, "sounds\\grenade\\grenade_flare.ogg");
}
}
else if (Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_NORMAL ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_STUN ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_FLASHBANG)
{
if (fDelay)
sprintf(zFilename, "sounds\\grenade\\grenade_pin_delay.ogg");
else
sprintf(zFilename, "sounds\\grenade\\grenade_pin.ogg");
}
else if (Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_SMOKE ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_TEARGAS ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_MUSTGAS ||
Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_SMOKE)
{
if (fDelay)
sprintf(zFilename, "sounds\\grenade\\grenade_gas_delay.ogg");
else
sprintf(zFilename, "sounds\\grenade\\grenade_gas.ogg");
}
else if (Explosive[Item[usItem].ubClassIndex].ubType == EXPLOSV_BURNABLEGAS)
{
if (fDelay)
sprintf(zFilename, "sounds\\grenade\\grenade_fire_delay.ogg");
else
sprintf(zFilename, "sounds\\grenade\\grenade_fire.ogg");
}
if (strlen(zFilename) > 0 && FileExists(zFilename))
{
PlayJA2SampleFromFile(zFilename, RATE_11025, SoundVolume(MIDVOLUME, this->sGridNo), 1, SoundDir(this->sGridNo));
}
}
}
}
// If we are NOT loading a game, continue normally
if ( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME) )
{