9a76eea2f5a4966f140916a40d0f5bf4b00fb01becea45defab258134a175bcf8a178f1ac7e4243e
868
        {
868
        {
869
            case I_Alien:
869
            case I_Alien:
870
            {
870
            {
871
                PlayAlienSound(0, ASC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
871
                SpeciesSound(0, ASC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, ALIEN_SOUND);
872
 
872
 
873
                if(SinglePlayer != AvP.PlayMode)
873
                if(SinglePlayer != AvP.PlayMode)
874
                    netGameData.myLastScream = ASC_Taunt;
874
                    netGameData.myLastScream = ASC_Taunt;
...
 
...
 
876
            break;
876
            break;
877
            case I_Marine:
877
            case I_Marine:
878
            {
878
            {
879
                PlayMarineScream(0, MSC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
879
                SpeciesSound(0, MSC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
880
 
880
 
881
                if(SinglePlayer != AvP.PlayMode)
881
                if(SinglePlayer != AvP.PlayMode)
882
                    netGameData.myLastScream = MSC_Taunt;
882
                    netGameData.myLastScream = MSC_Taunt;
...
 
...
 
884
            break;
884
            break;
885
            case I_Predator:
885
            case I_Predator:
886
            {
886
            {
887
                PlayPredatorSound(0, PSC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
887
                SpeciesSound(0, PSC_Taunt, 0, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
888
 
888
 
889
                if(SinglePlayer != AvP.PlayMode)
889
                if(SinglePlayer != AvP.PlayMode)
890
                    netGameData.myLastScream = PSC_Taunt;
890
                    netGameData.myLastScream = PSC_Taunt;
...
 
...
 
992
    switch (AvP.PlayerType)
992
    switch (AvP.PlayerType)
993
    {
993
    {
994
        case I_Alien:
994
        case I_Alien:
995
            PlayAlienSound(0, ASC_Scream_Dying, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position);
995
            SpeciesSound(0, ASC_Scream_Dying, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position, ALIEN_SOUND);
996
        break;
996
        break;
997
        case I_Marine:
997
        case I_Marine:
998
        {
998
        {
999
            if (damage->Id == AMMO_FACEHUGGER)
999
            if (damage->Id == AMMO_FACEHUGGER)
1000
                PlayMarineScream(0, MSC_Facehugged, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position);
1000
                SpeciesSound(0, MSC_Facehugged, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1001
            else
1001
            else
1002
                PlayMarineScream(0, MSC_Death, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position);
1002
                SpeciesSound(0, MSC_Death, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1003
        }  
1003
        }  
1004
        break;
1004
        break;
1005
        case I_Predator:
1005
        case I_Predator:
1006
        {
1006
        {
1007
            if (damage->Id == AMMO_FACEHUGGER)
1007
            if (damage->Id == AMMO_FACEHUGGER)
1008
                PlayPredatorSound(0, PSC_Facehugged, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position);
1008
                SpeciesSound(0, PSC_Facehugged, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1009
            else
1009
            else
1010
                PlayPredatorSound(0, PSC_Scream_Dying, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position);
1010
                SpeciesSound(0, PSC_Scream_Dying, 0, NULL, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1011
        }
1011
        }
1012
    }
1012
    }
1013
 
1013
 
...
 
...
 
1036
        if(damage)
1036
        if(damage)
1037
        {
1037
        {
1038
            if (damage->Id == AMMO_ALIEN_BITE_KILLSECTION)
1038
            if (damage->Id == AMMO_ALIEN_BITE_KILLSECTION)
1039
                Sound_Play(SID_ALIEN_JAW_ATTACK,"d", &PlayerStatus.sbptr->DynPtr->Position);
1039
                Sound_Play(SID_ALIEN_JAW_ATTACK, "d", &PlayerStatus.sbptr->DynPtr->Position);
1040
        }
1040
        }
1041
        /*---------------------------------**
1041
        /*---------------------------------**
1042
        **         Choose death anim sequence **
1042
        **         Choose death anim sequence **
...
 
...
 
1362
                {
1362
                {
1363
                    if (!damage->Impact && !damage->Cutting && !damage->Penetrative && damage->Fire &&
!damage->Electrical && !damage->Acid)
1363
                    if (!damage->Impact && !damage->Cutting && !damage->Penetrative && damage->Fire &&
!damage->Electrical && !damage->Acid)
1364
                    {
1364
                    {
1365
                        PlayAlienSound(0, ASC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1365
                        SpeciesSound(0, ASC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, ALIEN_SOUND);
1366
 
1366
 
1367
                        if(SinglePlayer != AvP.PlayMode)
1367
                        if(SinglePlayer != AvP.PlayMode)
1368
                            netGameData.myLastScream = ASC_PC_OnFire;
1368
                            netGameData.myLastScream = ASC_PC_OnFire;
1369
                    }
1369
                    }
1370
                    else
1370
                    else
1371
                    {
1371
                    {
1372
                        PlayAlienSound(0, ASC_Scream_Hurt, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1372
                        SpeciesSound(0, ASC_Scream_Hurt, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, ALIEN_SOUND);
1373
 
1373
 
1374
                        if(SinglePlayer != AvP.PlayMode)
1374
                        if(SinglePlayer != AvP.PlayMode)
1375
                            netGameData.myLastScream = ASC_Scream_Hurt;
1375
                            netGameData.myLastScream = ASC_Scream_Hurt;
...
 
...
 
1384
                    switch(damage->Id)
1384
                    switch(damage->Id)
1385
                    {
1385
                    {
1386
                        case AMMO_FACEHUGGER:
1386
                        case AMMO_FACEHUGGER:
1387
                            PlayMarineScream(0, MSC_Facehugged, pitch, &PlayerStatus.sound_mouth, NULL);
1387
                            SpeciesSound(0, MSC_Facehugged, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1388
                        break;
1388
                        break;
1389
                        case AMMO_FALLINGDAMAGE:
1389
                        case AMMO_FALLINGDAMAGE:
1390
                            PlayMarineScream(0, MSC_Falling, pitch, &PlayerStatus.sound_mouth, NULL);
1390
                            SpeciesSound(0, MSC_Falling, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1391
                        break;
1391
                        break;
1392
                        default:
1392
                        default:
1393
                        {
1393
                        {
...
 
...
 
1397
                                {
1397
                                {
1398
                                    if (!damage->Fire)
1398
                                    if (!damage->Fire)
1399
                                    {
1399
                                    {
1400
                                        PlayMarineScream(0, MSC_Acid, pitch, &PlayerStatus.sound_mouth, NULL);
1400
                                        SpeciesSound(0, MSC_Acid, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1401
 
1401
 
1402
                                        if(SinglePlayer != AvP.PlayMode)
1402
                                        if(SinglePlayer != AvP.PlayMode)
1403
                                            netGameData.myLastScream = MSC_Acid;
1403
                                            netGameData.myLastScream = MSC_Acid;
...
 
...
 
1406
                                }
1406
                                }
1407
                                else if (damage->Fire)
1407
                                else if (damage->Fire)
1408
                                {
1408
                                {
1409
                                    PlayMarineScream(0, MSC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, NULL);
1409
                                    SpeciesSound(0, MSC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1410
 
1410
 
1411
                                    if(SinglePlayer != AvP.PlayMode)
1411
                                    if(SinglePlayer != AvP.PlayMode)
1412
                                        netGameData.myLastScream = MSC_PC_OnFire;
1412
                                        netGameData.myLastScream = MSC_PC_OnFire;
...
 
...
 
1415
 
1415
 
1416
                            }
1416
                            }
1417
 
1417
 
1418
                            PlayMarineScream(0, MSC_Pain, pitch, &PlayerStatus.sound_mouth, NULL);
1418
                            SpeciesSound(0, MSC_Pain, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, HUMAN_SOUND);
1419
 
1419
 
1420
                            if(SinglePlayer != AvP.PlayMode)
1420
                            if(SinglePlayer != AvP.PlayMode)
1421
                                netGameData.myLastScream = MSC_Pain;
1421
                                netGameData.myLastScream = MSC_Pain;
...
 
...
 
1427
                {
1427
                {
1428
                    if (damage->Id == AMMO_FACEHUGGER)
1428
                    if (damage->Id == AMMO_FACEHUGGER)
1429
                    {
1429
                    {
1430
                        PlayPredatorSound(0, PSC_Facehugged, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1430
                        SpeciesSound(0, PSC_Facehugged, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1431
                    }
1431
                    }
1432
                    else
1432
                    else
1433
                    {
1433
                    {
...
 
...
 
1437
                            {
1437
                            {
1438
                                if (damage->Acid)
1438
                                if (damage->Acid)
1439
                                {
1439
                                {
1440
                                    PlayPredatorSound(0, PSC_Acid, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1440
                                    SpeciesSound(0, PSC_Acid, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1441
 
1441
 
1442
                                    if(SinglePlayer != AvP.PlayMode)
1442
                                    if(SinglePlayer != AvP.PlayMode)
1443
                                        netGameData.myLastScream = PSC_Acid;
1443
                                        netGameData.myLastScream = PSC_Acid;
...
 
...
 
1446
                            }
1446
                            }
1447
                            else if (!damage->Acid)
1447
                            else if (!damage->Acid)
1448
                            {
1448
                            {
1449
                                PlayPredatorSound(0, PSC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1449
                                SpeciesSound(0, PSC_PC_OnFire, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1450
 
1450
 
1451
                                if(SinglePlayer != AvP.PlayMode)
1451
                                if(SinglePlayer != AvP.PlayMode)
1452
                                    netGameData.myLastScream = PSC_PC_OnFire;
1452
                                    netGameData.myLastScream = PSC_PC_OnFire;
...
 
...
 
1454
                            } 
1454
                            } 
1455
                        }
1455
                        }
1456
 
1456
 
1457
                        PlayPredatorSound(0, PSC_Scream_Hurt, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position);
1457
                        SpeciesSound(0, PSC_Scream_Hurt, pitch, &PlayerStatus.sound_mouth, &PlayerStatus.sbptr->DynPtr->Position, PREDATOR_SOUND);
1458
 
1458
 
1459
                        if(SinglePlayer != AvP.PlayMode)
1459
                        if(SinglePlayer != AvP.PlayMode)
1460
                            netGameData.myLastScream = PSC_Scream_Hurt;
1460
                            netGameData.myLastScream = PSC_Scream_Hurt;