From 424a58f91b8fe6aec4c423963bfad37ee33db235 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 20 Aug 2022 17:11:15 +0200 Subject: [PATCH] - Blood: sfxPlay3DSound --- source/games/blood/src/actor.cpp | 20 ++++++++++---------- source/games/blood/src/sfx.cpp | 5 ++--- source/games/blood/src/sound.h | 7 ++++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 01e7218a0..1eaf791c8 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -2895,7 +2895,7 @@ bool actHealDude(DBloodActor* actor, int add, int threshold) threshold <<= 4; if (actor->xspr.health < (unsigned)threshold) { - if (actor->IsPlayerActor()) sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, 780, actor->sector()); + if (actor->IsPlayerActor()) sfxPlay3DSound(actor->spr.pos, 780, actor->sector()); actor->xspr.health = min(actor->xspr.health + add, threshold); return true; } @@ -3728,7 +3728,7 @@ static int actDamageThing(DBloodActor* source, DBloodActor* actor, int damage, D { case -1: GibSprite(actor, GIBTYPE_14, nullptr, nullptr); - sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, 312, actor->sector()); + sfxPlay3DSound(actor->spr.pos, 312, actor->sector()); actPostSprite(actor, kStatFree); break; @@ -3901,7 +3901,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode) case kMissileArcGargoyle: sfxKill3DSound(missileActor, -1, -1); - sfxPlay3DSound(missileActor->int_pos().X, missileActor->int_pos().Y, missileActor->int_pos().Z, 306, missileActor->sector()); + sfxPlay3DSound(missileActor->spr.pos, 306, missileActor->sector()); GibSprite(missileActor, GIBTYPE_6, NULL, NULL); if (hitCode == 3 && actorHit && (pThingInfo || pDudeInfo)) @@ -3915,7 +3915,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode) case kMissileLifeLeechAltNormal: case kMissileLifeLeechAltSmall: sfxKill3DSound(missileActor, -1, -1); - sfxPlay3DSound(missileActor->int_pos().X, missileActor->int_pos().Y, missileActor->int_pos().Z, 306, missileActor->sector()); + sfxPlay3DSound(missileActor->spr.pos, 306, missileActor->sector()); if (hitCode == 3 && actorHit && (pThingInfo || pDudeInfo)) { @@ -4029,7 +4029,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode) case kMissileEctoSkull: sfxKill3DSound(missileActor, -1, -1); - sfxPlay3DSound(missileActor->int_pos().X, missileActor->int_pos().Y, missileActor->int_pos().Z, 522, missileActor->sector()); + sfxPlay3DSound(missileActor->spr.pos, 522, missileActor->sector()); actPostSprite(missileActor, kStatDebris); seqSpawn(20, missileActor, -1); if (hitCode == 3 && actorHit && actorHit->hasX()) @@ -4062,7 +4062,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode) case kMissileTeslaRegular: sfxKill3DSound(missileActor, -1, -1); - sfxPlay3DSound(missileActor->int_pos().X, missileActor->int_pos().Y, missileActor->int_pos().Z, 518, missileActor->sector()); + sfxPlay3DSound(missileActor->spr.pos, 518, missileActor->sector()); GibSprite(missileActor, (hitCode == 2) ? GIBTYPE_23 : GIBTYPE_22, NULL, NULL); evKillActor(missileActor); seqKill(missileActor); @@ -4296,7 +4296,7 @@ static void checkHit(DBloodActor* actor) break; case kThingZombieHead: - sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, 357, actor->sector()); + sfxPlay3DSound(actor->spr.pos, 357, actor->sector()); actKickObject(actor, actor2); actDamageSprite(nullptr, actor2, kDamageFall, 80); break; @@ -4374,7 +4374,7 @@ static void checkFloorHit(DBloodActor* actor) pPlayer->kickPower = PlayClock + 60; } actKickObject(actor, actor2); - sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, 357, actor->sector()); + sfxPlay3DSound(actor->spr.pos, 357, actor->sector()); sfxPlay3DSound(actor, 374, 0, 0); break; case kThingZombieHead: @@ -4384,7 +4384,7 @@ static void checkFloorHit(DBloodActor* actor) pPlayer->kickPower = PlayClock + 60; } actKickObject(actor, actor2); - sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, 357, actor->sector()); + sfxPlay3DSound(actor->spr.pos, 357, actor->sector()); actDamageSprite(nullptr, actor2, kDamageFall, 80); break; case kTrapSawCircular: @@ -5527,7 +5527,7 @@ void actActivateGibObject(DBloodActor* actor) if (gib1 > 0) GibSprite(actor, (GIBTYPE)(gib1 - 1), nullptr, nullptr); if (gib2 > 0) GibSprite(actor, (GIBTYPE)(gib2 - 1), nullptr, nullptr); if (gib3 > 0 && actor->xspr.burnTime > 0) GibSprite(actor, (GIBTYPE)(gib3 - 1), nullptr, nullptr); - if (sound > 0) sfxPlay3DSound(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, sound, actor->sector()); + if (sound > 0) sfxPlay3DSound(actor->spr.pos, sound, actor->sector()); if (dropmsg > 0) actDropObject(actor, dropmsg); if (!(actor->spr.cstat & CSTAT_SPRITE_INVISIBLE) && !(actor->spr.flags & kHitagRespawn)) diff --git a/source/games/blood/src/sfx.cpp b/source/games/blood/src/sfx.cpp index 525f989a9..0b789b060 100644 --- a/source/games/blood/src/sfx.cpp +++ b/source/games/blood/src/sfx.cpp @@ -164,14 +164,13 @@ FSoundID getSfx(FSoundID soundId, float& attenuation, int& pitch, int& relvol) // //--------------------------------------------------------------------------- -void sfxPlay3DSound(int x, int y, int z, int soundId, sectortype* pSector) +void sfxPlay3DSound(const DVector3& pos, int soundId, sectortype* pSector) { if (!SoundEnabled() || soundId < 0) return; auto sid = soundEngine->FindSoundByResID(soundId); if (sid == 0) return; - vec3_t xyz = { x, y, z }; - auto svec = GetSoundPos(xyz); + auto svec = GetSoundPos(pos); float attenuation; int pitch = -1; diff --git a/source/games/blood/src/sound.h b/source/games/blood/src/sound.h index bdc942c14..ee6cc2544 100644 --- a/source/games/blood/src/sound.h +++ b/source/games/blood/src/sound.h @@ -50,7 +50,12 @@ void sndProcess(void); void sndTerm(void); void sndInit(void); -void sfxPlay3DSound(int x, int y, int z, int soundId, sectortype* pSector); +void sfxPlay3DSound(const DVector3& pos, int soundId, sectortype* pSector); +inline void sfxPlay3DSound(int x, int y, int z, int soundId, sectortype* pSector) +{ + DVector3 pos(x * inttoworld, y * inttoworld, z * zinttoworld); + sfxPlay3DSound(pos, soundId, pSector); +} void sfxPlay3DSound(DBloodActor* pSprite, int soundId, int a3 = -1, int a4 = 0); void sfxPlay3DSoundCP(DBloodActor* pSprite, int soundId, int a3 = -1, int a4 = 0, int pitch = 0, int volume = 0); void sfxKill3DSound(DBloodActor* pSprite, int a2 = -1, int a3 = -1);