diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index 6f2c022bb..4c7b704f1 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -1405,7 +1405,7 @@ void SetHiRes() void DoClockBeep() { for (int i = headspritestat[407]; i != -1; i = nextspritestat[i]) { -// TODO PlayFX2(StaticSound[kSound74], i); + PlayFX2(StaticSound[kSound74], i); } } @@ -1421,7 +1421,7 @@ void DoRedAlert(int nVal) { if (nVal) { -// TODO PlayFXAtXYZ(StaticSound[kSoundAlarm], sprite[i].x, sprite[i].y, sprite[i].z, sprite[i].sectnum); + PlayFXAtXYZ(StaticSound[kSoundAlarm], sprite[i].x, sprite[i].y, sprite[i].z, sprite[i].sectnum); AddFlash(sprite[i].sectnum, sprite[i].x, sprite[i].y, sprite[i].z, 192); } } @@ -2505,7 +2505,7 @@ void DoGameOverScene() Clip(); videoNextPage(); CinemaFadeIn(); - // TODO PlayGameOverSound(); + PlayGameOverSound(); WaitAnyKey(3); FadeOut(0); SetOverscan(kenpal); @@ -2544,7 +2544,7 @@ void DoTitle() videoNextPage(); FadeIn(); - // TODO PlayLogoSound(); + PlayLogoSound(); WaitAnyKey(2); @@ -2588,7 +2588,7 @@ void DoTitle() WaitNoKey(2, KeyFn1); if (time(0) & 0xF) { - // TODO PlayGameOverSound(); + PlayGameOverSound(); } else { PlayLocalSound(StaticSound[61], 0); @@ -3255,7 +3255,7 @@ int DoSpiritHead() if (esi < eax) { - // SoundBigEntrance(); // TODO + SoundBigEntrance(); AddGlow(sprite[nSpiritSprite].sectnum, 20); AddFlash( sprite[nSpiritSprite].sectnum, diff --git a/source/exhumed/src/fish.cpp b/source/exhumed/src/fish.cpp index f8d6f92e4..160d46128 100644 --- a/source/exhumed/src/fish.cpp +++ b/source/exhumed/src/fish.cpp @@ -9,6 +9,7 @@ #include "move.h" #include "trigdat.h" #include "init.h" +#include "sound.h" #include #define kMaxFishes 128 @@ -348,7 +349,7 @@ void FuncFish(int a, int nDamage, int nRun) BuildFishLimb(nFish, i); } -// TODO PlayFXAtXYZ(StaticSound[kSound40], sprite[nSprite].x, sprite[nSprite].y, sprite[nSprite].z, sprite[nSprite].sectnum); + PlayFXAtXYZ(StaticSound[kSound40], sprite[nSprite].x, sprite[nSprite].y, sprite[nSprite].z, sprite[nSprite].sectnum); DestroyFish(nFish); } else diff --git a/source/exhumed/src/object.cpp b/source/exhumed/src/object.cpp index 616d6280c..b7b1090c5 100644 --- a/source/exhumed/src/object.cpp +++ b/source/exhumed/src/object.cpp @@ -495,13 +495,11 @@ int CheckSectorSprites(short nSector, int nVal) if (sprite[nSprite].statnum == 100 && PlayerList[GetPlayerFromSprite(nSprite)].nHealth <= 0) { - /* TODO PlayFXAtXYZ(StaticSound[kSoundJonFDie], sprite[nSprite].x, sprite[nSprite].y, sprite[nSprite].z, sprite[nSprite].sectnum | 0x40FF); // TODO - check last param?? - */ } } nSprite = nextspritesect[nSprite]; @@ -737,7 +735,7 @@ void FuncElev(int a, int b, int nRun) SetQuake(di, 30); } -// TODO PlayFXAtXYZ(StaticSound[kSound26], sprite[di].x, sprite[di].y, sprite[di].z, sprite[di].sectnum); + PlayFXAtXYZ(StaticSound[kSound26], sprite[di].x, sprite[di].y, sprite[di].z, sprite[di].sectnum); } if (var_18 & 0x4) @@ -1500,7 +1498,7 @@ void DoFinale() if (!RandomSize(2)) { -// TODO PlayFX2(StaticSound[kSound78] | 0x2000, nFinaleSpr); + PlayFX2(StaticSound[kSound78] | 0x2000, nFinaleSpr); for (int i = 0; i < nTotalPlayers; i++) { nQuake[i] = 1280; @@ -1675,7 +1673,7 @@ void ExplodeEnergyBlock(int nSprite) sprite[nSprite].cstat = 0; sprite[nSprite].xrepeat = 100; -// TODO PlayFX2(StaticSound[kSound78], nSprite); + PlayFX2(StaticSound[kSound78], nSprite); sprite[nSprite].xrepeat = 0; @@ -1888,7 +1886,7 @@ void ExplodeScreen(short nSprite) } sprite[nSprite].cstat = 0x8000; -// TODO PlayFX2(StaticSound[kSound78], nSprite); + PlayFX2(StaticSound[kSound78], nSprite); } void FuncObject(int a, int b, int nRun) diff --git a/source/exhumed/src/player.cpp b/source/exhumed/src/player.cpp index b590ef88c..1ecccb889 100644 --- a/source/exhumed/src/player.cpp +++ b/source/exhumed/src/player.cpp @@ -1275,7 +1275,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) sprite[nPlayerSprite].yvel = 0; StopSpriteSound(nPlayerSprite); -// TODO PlayFXAtXYZ(StaticSound[kSoundJonFDie], sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum |= 0x4000); // CHECKME + PlayFXAtXYZ(StaticSound[kSoundJonFDie], sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum |= 0x4000); // CHECKME } else { @@ -1350,7 +1350,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) { if (nPlayerPushSect[nPlayer] > -1) { -// TODO StopSpriteSound(sBlockInfo[sector[nPlayerPushSect[nPlayer]].extra].nSprite); + StopSpriteSound(sBlockInfo[sector[nPlayerPushSect[nPlayer]].extra].nSprite); } nPlayerPushSound[nPlayer] = -1; diff --git a/source/exhumed/src/queen.cpp b/source/exhumed/src/queen.cpp index 6291c61e7..406388692 100644 --- a/source/exhumed/src/queen.cpp +++ b/source/exhumed/src/queen.cpp @@ -11,6 +11,7 @@ #include "trigdat.h" #include "anims.h" #include "player.h" +#include "sound.h" #include #define kMaxQueens 1 @@ -988,7 +989,7 @@ void FuncQueenHead(int a, int nDamage, int nRun) if ((nMov & 0x3FFF) == nTarget) { runlist_DamageEnemy(nTarget, nSprite, 10); -// TODO D3PlayFX((StaticSound[kSoundQTail] | 0x2000)) & 0xFFFF, nSprite); + D3PlayFX((StaticSound[kSoundQTail] | 0x2000) & 0xFFFF, nSprite); sprite[nSprite].ang += RandomSize(9) + 768; sprite[nSprite].ang &= kAngleMask; @@ -1573,14 +1574,12 @@ void FuncQueen(int a, int nDamage, int nRun) sprite[nChunkSprite].picnum = 3126; sprite[nChunkSprite].yrepeat = 100; sprite[nChunkSprite].xrepeat = 100; -/* TODO PlayFXAtXYZ( StaticSound[40], sprite[nSprite].x, sprite[nSprite].y, sprite[nSprite].z, sprite[nSprite].sectnum); -*/ BuildQueenHead(nQueen); QueenList[nQueen].nAction++; diff --git a/source/exhumed/src/snake.cpp b/source/exhumed/src/snake.cpp index ce3bc2351..858ba3be5 100644 --- a/source/exhumed/src/snake.cpp +++ b/source/exhumed/src/snake.cpp @@ -234,7 +234,7 @@ int BuildSnake(short nPlayer, short zVal) } } -// TODO D3PlayFX(StaticSound[kSound6], var_24); + D3PlayFX(StaticSound[kSound6], var_24); } return nSprite; diff --git a/source/exhumed/src/sound.h b/source/exhumed/src/sound.h index 72b39d4e2..0ce3faaab 100644 --- a/source/exhumed/src/sound.h +++ b/source/exhumed/src/sound.h @@ -116,4 +116,10 @@ void StopSpriteSound(short nSprite); void StartSwirlies(); void UpdateSwirlies(); +void PlayLogoSound(void); +void PlayTitleSound(void); +void PlayGameOverSound(void); + +void SoundBigEntrance(void); + #endif diff --git a/source/exhumed/src/switch.cpp b/source/exhumed/src/switch.cpp index 9f807090f..a7ec1357b 100644 --- a/source/exhumed/src/switch.cpp +++ b/source/exhumed/src/switch.cpp @@ -4,6 +4,7 @@ #include "runlist.h" #include "engine.h" #include "player.h" +#include "sound.h" #include #include @@ -273,7 +274,7 @@ void FuncSwStepOn(int a, int, int nRun) if (var_14 != sRunChannels[nChannel].c) { short nWall = sector[nSector].wallptr; -// TODO PlayFXAtXYZ(StaticSound[nSwitchSound], wall[nWall].x, wall[nWall].y, sector[nSector].floorz, nSector); + PlayFXAtXYZ(StaticSound[nSwitchSound], wall[nWall].x, wall[nWall].y, sector[nSector].floorz, nSector); assert(sRunChannels[nChannel].c < 8); @@ -439,7 +440,7 @@ void FuncSwPressSector(int a, int, int nRun) if (SwitchData[nSwitch].field_12) { short nSprite = PlayerList[nPlayer].nSprite; - // TODO PlayFXAtXYZ(StaticSound[nSwitchSound], sprite[nSprite].x, sprite[nSprite].y, 0, sprite[nSprite].sectnum); + PlayFXAtXYZ(StaticSound[nSwitchSound], sprite[nSprite].x, sprite[nSprite].y, 0, sprite[nSprite].sectnum); StatusMessage(300, "YOU NEED THE KEY FOR THIS DOOR"); } @@ -516,7 +517,7 @@ void FuncSwPressWall(int a, int, int nRun) short nWall = SwitchData[nSwitch].nWall; short nSector = SwitchData[nSwitch].nSector; // CHECKME - where is this set?? -// TODO PlayFXAtXYZ(StaticSound[nSwitchSound], wall[nWall].x, wall[nWall].y, 0, nSector); + PlayFXAtXYZ(StaticSound[nSwitchSound], wall[nWall].x, wall[nWall].y, 0, nSector); return; }