diff options
| author | robojumper <robojumper@gmail.com> | 2025-06-28 16:00:03 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-09-13 10:53:30 +0200 |
| commit | 415e388fee13aea9b524ccf06a89013d6aeb08dd (patch) | |
| tree | fd1677d974844ba3529ee01c439aad12c4d8580f /include/d | |
| parent | 2a85444daa23b86e76611c0167d01db99803bf30 (diff) | |
d_snd_source_npc_head OK
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/snd/d_snd_source.h | 2 | ||||
| -rw-r--r-- | include/d/snd/d_snd_source_if.h | 2 | ||||
| -rw-r--r-- | include/d/snd/d_snd_source_npc_head.h | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/include/d/snd/d_snd_source.h b/include/d/snd/d_snd_source.h index 0795c848..b2a1ee49 100644 --- a/include/d/snd/d_snd_source.h +++ b/include/d/snd/d_snd_source.h @@ -173,7 +173,7 @@ public: return false; } /* 0x0D8 */ virtual bool startVoiceLine(const char *label) override; - /* 0x0DC */ virtual bool vt_0xDC() override { + /* 0x0DC */ virtual bool vt_0xDC(u32 id) override { return false; } /* 0x0E0 */ virtual void stopCurrentActionSound() override {} diff --git a/include/d/snd/d_snd_source_if.h b/include/d/snd/d_snd_source_if.h index 36244d10..2ff36728 100644 --- a/include/d/snd/d_snd_source_if.h +++ b/include/d/snd/d_snd_source_if.h @@ -87,7 +87,7 @@ public: /* 0x0D0 */ virtual bool holdSoundAtPosition(const char *label, const nw4r::math::VEC3 *position) = 0; /* 0x0D4 */ virtual bool startVoiceLine(u32 id) = 0; /* 0x0D8 */ virtual bool startVoiceLine(const char *label) = 0; - /* 0x0DC */ virtual bool vt_0xDC() = 0; + /* 0x0DC */ virtual bool vt_0xDC(u32 id) = 0; /* 0x0E0 */ virtual void stopCurrentActionSound() = 0; /* 0x0E4 */ virtual void stopActionSound(u32 id) = 0; /* 0x0E8 */ virtual bool isPlayingActionSound() const = 0; diff --git a/include/d/snd/d_snd_source_npc_head.h b/include/d/snd/d_snd_source_npc_head.h index a1da3d49..b033af2d 100644 --- a/include/d/snd/d_snd_source_npc_head.h +++ b/include/d/snd/d_snd_source_npc_head.h @@ -12,6 +12,16 @@ public: mpMainName = name; } + /* 0x0D4 */ virtual bool startVoiceLine(u32 id) override; + /* 0x0DC */ virtual bool vt_0xDC(u32 id) override; + + /* 0x180 */ virtual void setOrigName(const char *arg) override; + + // id can be a WZSound ID or an offset from LABEL_NV_START + /* 0x1EC */ virtual bool npcSpeak(u32 id); + + /* 0x1CC */ virtual void postSetupSound(u32 playingId, u32 requestedId, dSndSeSound_c *seSound) override; + private: /* 0x15C */ UNKWORD field_0x15C; /* 0x160 */ const char *mpMainName; |
