9a76eea2f5a4966f140916a40d0f5bf4b00fb01b | ecea45defab258134a175bcf8a178f1ac7e4243e | ||
---|---|---|---|
1418 | switch(messagePtr->characterType) | 1418 | switch(messagePtr->characterType) |
1419 | { | 1419 | { |
1420 | case NGCT_Marine : | 1420 | case NGCT_Marine : |
1421 | PlayMarineScream(0, (MARINE_SOUND_CATERGORY)messagePtr->scream,0,&ghostData->SoundHandle2,&position); | 1421 | SpeciesSound(0, (MARINE_SOUND_CATERGORY)messagePtr->scream, 0, &ghostData->SoundHandle2, &position, HUMAN_SOUND); |
1422 | break; | 1422 | break; |
1423 | case NGCT_Alien : | 1423 | case NGCT_Alien : |
1424 | PlayAlienSound(0, (ALIEN_SOUND_CATEGORY)messagePtr->scream,0,&ghostData->SoundHandle2,&position); | 1424 | SpeciesSound(0, (ALIEN_SOUND_CATEGORY)messagePtr->scream, 0, &ghostData->SoundHandle2, &position, ALIEN_SOUND); |
1425 | break; | 1425 | break; |
1426 | case NGCT_Predator : | 1426 | case NGCT_Predator : |
1427 | if ((PREDATOR_SOUND_CATEGORY)messagePtr->scream == PSC_Medicomp_Special) | 1427 | if ((PREDATOR_SOUND_CATEGORY)messagePtr->scream == PSC_Medicomp_Special) |
1428 | Sound_Play(SID_PRED_ROAR, "de", &position, &ghostData->SoundHandle2); | 1428 | Sound_Play(SID_PRED_ROAR, "de", &position, &ghostData->SoundHandle2); |
1429 | else | 1429 | else |
1430 | PlayPredatorSound(0, (PREDATOR_SOUND_CATEGORY)messagePtr->scream,0,&ghostData->SoundHandle2,&position); | 1430 | SpeciesSound(0, (PREDATOR_SOUND_CATEGORY)messagePtr->scream, 0, &ghostData->SoundHandle2, &position, PREDATOR_SOUND); |
1431 | } | 1431 | } |
1432 | } | 1432 | } |
1433 | 1433 | ||
... | ... | ||
2194 | switch(netGameData.playerData[senderPlayerIndex].characterType) | 2194 | switch(netGameData.playerData[senderPlayerIndex].characterType) |
2195 | { | 2195 | { |
2196 | case NGCT_Alien: | 2196 | case NGCT_Alien: |
2197 | PlayAlienSound(0, ASC_Scream_Dying, 0, NULL, &sbPtr->DynPtr->Position); | 2197 | SpeciesSound(0, ASC_Scream_Dying, 0, NULL, &sbPtr->DynPtr->Position, ALIEN_SOUND); |
2198 | break; | 2198 | break; |
2199 | case NGCT_Marine: | 2199 | case NGCT_Marine: |
2200 | PlayMarineScream(0, MSC_Death, 0, NULL, &sbPtr->DynPtr->Position); | 2200 | SpeciesSound(0, MSC_Death, 0, NULL, &sbPtr->DynPtr->Position, HUMAN_SOUND); |
2201 | break; | 2201 | break; |
2202 | case NGCT_Predator: | 2202 | case NGCT_Predator: |
2203 | PlayPredatorSound(0, PSC_Scream_Dying, 0, NULL, &sbPtr->DynPtr->Position); | 2203 | SpeciesSound(0, PSC_Scream_Dying, 0, NULL, &sbPtr->DynPtr->Position, PREDATOR_SOUND); |
2204 | break; | 2204 | break; |
2205 | default: | 2205 | default: |
2206 | { | 2206 | { |
... | ... | ||
3809 | position.vy = messagePtr->vy; | 3809 | position.vy = messagePtr->vy; |
3810 | position.vz = messagePtr->vz; | 3810 | position.vz = messagePtr->vz; |
3811 | 3811 | ||
3812 | PlayAlienSound((int)messagePtr->alienType,(int)messagePtr->soundCategory,messagePtr->pitch,NULL,&position); | 3812 | SpeciesSound((int)messagePtr->alienType, (int)messagePtr->soundCategory, messagePtr->pitch, NULL, &position, ALIEN_SOUND); |
3813 | } | 3813 | } |
3814 | } | 3814 | } |
3815 | 3815 |