From 1bc7c53351750ab0815903563577d50db320ac59 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 14 Dec 2022 14:42:34 +0100 Subject: [PATCH] - move the recon's FTA sound into the scripted actor. --- source/games/duke/src/actors_d.cpp | 3 --- wadsrc/static/zscript/games/duke/actors/recon.zs | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 1ab13138a..d02a47c02 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -54,9 +54,6 @@ void check_fta_sounds_d(DDukeActor* actor) { if (actor->spr.extra > 0) switch (actor->spr.picnum) { - case DTILE_RECON: - S_PlayActorSound(RECO_RECOG, actor); - break; case DTILE_DRONE: S_PlayActorSound(DRON_RECOG, actor); break; diff --git a/wadsrc/static/zscript/games/duke/actors/recon.zs b/wadsrc/static/zscript/games/duke/actors/recon.zs index a48113b5e..938ccaa2c 100644 --- a/wadsrc/static/zscript/games/duke/actors/recon.zs +++ b/wadsrc/static/zscript/games/duke/actors/recon.zs @@ -209,6 +209,11 @@ class DukeRecon : DukeActor t.SetSpritePic(self, abs(self.temp_data[3]) > 64); return true; } + + override void PlayFTASound() + { + self.PlayActorSound("RECO_RECOG"); + } } @@ -242,6 +247,10 @@ class RedneckUFO1 : DukeRecon { return true; } + + override void PlayFTASound() + { + } } class RedneckUFO2 : RedneckUFO1