9a76eea2f5a4966f140916a40d0f5bf4b00fb01b | ecea45defab258134a175bcf8a178f1ac7e4243e | ||
---|---|---|---|
340 | } | 340 | } |
341 | } | 341 | } |
342 | 342 | ||
343 | PlayPredatorSound(0, PSC_Swipe, 0, NULL, &sbPtr->DynPtr->Position); | 343 | SpeciesSound(0, PSC_Swipe, 0, NULL, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
344 | } | 344 | } |
345 | /* Prepare next flag. */ | 345 | /* Prepare next flag. */ |
346 | workingflags >>= 1; | 346 | workingflags >>= 1; |
... | ... | ||
1065 | assert(predatorStatusPointer); | 1065 | assert(predatorStatusPointer); |
1066 | 1066 | ||
1067 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 1067 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
1068 | PlayPredatorSound(0, PSC_Scream_General, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 1068 | SpeciesSound(0, PSC_Scream_General, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | static void predator_change_behaviour(STRATEGYBLOCK *sbPtr) | 1071 | static void predator_change_behaviour(STRATEGYBLOCK *sbPtr) |
... | ... | ||
1637 | predatorStatusPointer->HModelController.LoopAfterTweening = 0; | 1637 | predatorStatusPointer->HModelController.LoopAfterTweening = 0; |
1638 | 1638 | ||
1639 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 1639 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
1640 | PlayPredatorSound(0, PSC_Taunt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 1640 | SpeciesSound(0, PSC_Taunt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
1641 | } | 1641 | } |
1642 | } | 1642 | } |
1643 | else | 1643 | else |
... | ... | ||
2768 | int rand = FastRandom(); | 2768 | int rand = FastRandom(); |
2769 | int pitch = (rand & 255) - 128; | 2769 | int pitch = (rand & 255) - 128; |
2770 | 2770 | ||
2771 | PlayPredatorSound(0, PSC_Scream_Dying, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 2771 | SpeciesSound(0, PSC_Scream_Dying, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
2772 | } | 2772 | } |
2773 | } | 2773 | } |
2774 | } | 2774 | } |
... | ... | ||
2839 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 2839 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
2840 | { | 2840 | { |
2841 | int pitch = (FastRandom() & 255) - 128; | 2841 | int pitch = (FastRandom() & 255) - 128; |
2842 | PlayPredatorSound(0, PSC_Acid, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 2842 | SpeciesSound(0, PSC_Acid, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
2843 | } | 2843 | } |
2844 | } | 2844 | } |
2845 | else | 2845 | else |
... | ... | ||
2847 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 2847 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
2848 | { | 2848 | { |
2849 | int pitch = (FastRandom() & 255) - 128; | 2849 | int pitch = (FastRandom() & 255) - 128; |
2850 | PlayPredatorSound(0, PSC_Scream_Hurt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 2850 | SpeciesSound(0, PSC_Scream_Hurt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
2851 | } | 2851 | } |
2852 | } | 2852 | } |
2853 | 2853 | ||
... | ... | ||
3346 | predatorStatusPointer->HModelController.LoopAfterTweening = 0; | 3346 | predatorStatusPointer->HModelController.LoopAfterTweening = 0; |
3347 | 3347 | ||
3348 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) | 3348 | if (predatorStatusPointer->soundHandle == SOUND_NOACTIVEINDEX) |
3349 | PlayPredatorSound(0, PSC_Taunt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position); | 3349 | SpeciesSound(0, PSC_Taunt, pitch, &predatorStatusPointer->soundHandle, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
3350 | } | 3350 | } |
3351 | } | 3351 | } |
3352 | 3352 |