9a76eea2f5a4966f140916a40d0f5bf4b00fb01b | ecea45defab258134a175bcf8a178f1ac7e4243e | ||
---|---|---|---|
557 | 557 | ||
558 | if (alienStatusPointer->sound_mouth == SOUND_NOACTIVEINDEX) | 558 | if (alienStatusPointer->sound_mouth == SOUND_NOACTIVEINDEX) |
559 | { | 559 | { |
560 | PlayAlienSound((int)alienStatusPointer->Type, ASC_Scream_General, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position); | 560 | SpeciesSound((int)alienStatusPointer->Type, ASC_Scream_General, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
561 | 561 | ||
562 | if(NetworkPeer == AvP.PlayMode) | 562 | if(NetworkPeer == AvP.PlayMode) |
563 | AddNetMsg_SpotAlienSound((int)ASC_Scream_General, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); | 563 | AddNetMsg_SpotAlienSound((int)ASC_Scream_General, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); |
... | ... | ||
710 | /* | 710 | /* |
711 | if (alienStatusPointer->sound_mouth == SOUND_NOACTIVEINDEX) | 711 | if (alienStatusPointer->sound_mouth == SOUND_NOACTIVEINDEX) |
712 | { | 712 | { |
713 | PlayAlienSound((int)alienStatusPointer->Type, ASC_Taunt, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position); | 713 | SpeciesSound((int)alienStatusPointer->Type, ASC_Taunt, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
714 | 714 | ||
715 | if(NetworkPeer == AvP.PlayMode) | 715 | if(NetworkPeer == AvP.PlayMode) |
716 | AddNetMsg_SpotAlienSound((int)ASC_Taunt, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); | 716 | AddNetMsg_SpotAlienSound((int)ASC_Taunt, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); |
... | ... | ||
3797 | /* Is it still attached? */ | 3797 | /* Is it still attached? */ |
3798 | if (head && !(head->flags & section_data_notreal)) | 3798 | if (head && !(head->flags & section_data_notreal)) |
3799 | { | 3799 | { |
3800 | PlayAlienSound((int)alienStatusPointer->Type, ASC_Scream_Dying, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position); | 3800 | SpeciesSound((int)alienStatusPointer->Type, ASC_Scream_Dying, 0, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
3801 | //PlayAlienSound((int)alienStatusPointer->Type, ASC_Death, 0, NULL, &sbPtr->DynPtr->Position); | 3801 | //SpeciesSound((int)alienStatusPointer->Type, ASC_Death, 0, NULL, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
3802 | 3802 | ||
3803 | if(NetworkPeer == AvP.PlayMode) | 3803 | if(NetworkPeer == AvP.PlayMode) |
3804 | AddNetMsg_SpotAlienSound((int)ASC_Scream_Dying, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); | 3804 | AddNetMsg_SpotAlienSound((int)ASC_Scream_Dying, (int)alienStatusPointer->Type, 0, &sbPtr->DynPtr->Position); |
... | ... | ||
4149 | { | 4149 | { |
4150 | int pitch = (FastRandom() & 255) - 128; | 4150 | int pitch = (FastRandom() & 255) - 128; |
4151 | 4151 | ||
4152 | PlayAlienSound((int)alienStatusPointer->Type, ASC_Scream_Hurt, pitch, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position); | 4152 | SpeciesSound((int)alienStatusPointer->Type, ASC_Scream_Hurt, pitch, &alienStatusPointer->sound_mouth, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
4153 | 4153 | ||
4154 | if(NetworkPeer == AvP.PlayMode) | 4154 | if(NetworkPeer == AvP.PlayMode) |
4155 | AddNetMsg_SpotAlienSound(ASC_Scream_Hurt, (int)alienStatusPointer->Type, pitch, &sbPtr->DynPtr->Position); | 4155 | AddNetMsg_SpotAlienSound(ASC_Scream_Hurt, (int)alienStatusPointer->Type, pitch, &sbPtr->DynPtr->Position); |