mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-26 21:13:51 +00:00
Wire SMSG_PLAY_SOUND to AudioEngine via SoundEntries.dbc lookup
Add PlaySoundCallback to GameHandler (same pattern as PlayMusicCallback). When SMSG_PLAY_SOUND arrives, resolve the soundId through SoundEntries.dbc (fields 3-12 = files, field 23 = DirectoryBase) and play the first found file as a 2-D sound effect via AudioEngine::playSound2D(). Previously the opcode was parsed and dropped.
This commit is contained in:
parent
55082a0925
commit
a2c2675039
3 changed files with 29 additions and 1 deletions
|
|
@ -943,6 +943,11 @@ public:
|
|||
using PlayMusicCallback = std::function<void(uint32_t soundId)>;
|
||||
void setPlayMusicCallback(PlayMusicCallback cb) { playMusicCallback_ = std::move(cb); }
|
||||
|
||||
// Server-triggered 2-D sound effect callback — fires when SMSG_PLAY_SOUND is received.
|
||||
// The soundId corresponds to a SoundEntries.dbc record.
|
||||
using PlaySoundCallback = std::function<void(uint32_t soundId)>;
|
||||
void setPlaySoundCallback(PlaySoundCallback cb) { playSoundCallback_ = std::move(cb); }
|
||||
|
||||
// Mount state
|
||||
using MountCallback = std::function<void(uint32_t mountDisplayId)>; // 0 = dismount
|
||||
void setMountCallback(MountCallback cb) { mountCallback_ = std::move(cb); }
|
||||
|
|
@ -2095,8 +2100,9 @@ private:
|
|||
// ---- Forced faction reactions (SMSG_SET_FORCED_REACTIONS) ----
|
||||
std::unordered_map<uint32_t, uint8_t> forcedReactions_; // factionId -> reaction tier
|
||||
|
||||
// ---- Server-triggered music ----
|
||||
// ---- Server-triggered audio ----
|
||||
PlayMusicCallback playMusicCallback_;
|
||||
PlaySoundCallback playSoundCallback_;
|
||||
};
|
||||
|
||||
} // namespace game
|
||||
|
|
|
|||
|
|
@ -2121,6 +2121,27 @@ void Application::setupUICallbacks() {
|
|||
}
|
||||
});
|
||||
|
||||
// SMSG_PLAY_SOUND: look up SoundEntries.dbc and play 2-D sound effect
|
||||
gameHandler->setPlaySoundCallback([this](uint32_t soundId) {
|
||||
if (!assetManager) return;
|
||||
|
||||
auto dbc = assetManager->loadDBC("SoundEntries.dbc");
|
||||
if (!dbc || !dbc->isLoaded()) return;
|
||||
|
||||
int32_t idx = dbc->findRecordById(soundId);
|
||||
if (idx < 0) return;
|
||||
|
||||
const uint32_t row = static_cast<uint32_t>(idx);
|
||||
std::string dir = dbc->getString(row, 23);
|
||||
for (uint32_t f = 3; f <= 12; ++f) {
|
||||
std::string name = dbc->getString(row, f);
|
||||
if (name.empty()) continue;
|
||||
std::string path = dir.empty() ? name : dir + "\\" + name;
|
||||
audio::AudioEngine::instance().playSound2D(path);
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
// Other player level-up callback — trigger 3D effect + chat notification
|
||||
gameHandler->setOtherPlayerLevelUpCallback([this](uint64_t guid, uint32_t newLevel) {
|
||||
if (!gameHandler || !renderer) return;
|
||||
|
|
|
|||
|
|
@ -3041,6 +3041,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
|
|||
if (packet.getSize() - packet.getReadPos() >= 4) {
|
||||
uint32_t soundId = packet.readUInt32();
|
||||
LOG_DEBUG("SMSG_PLAY_SOUND id=", soundId);
|
||||
if (playSoundCallback_) playSoundCallback_(soundId);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue