diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index 739f04eeb..c0c0ce845 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -735,9 +735,9 @@ void ObjectList::playMusic() { for (const auto &baseObject : baseObjects) { - LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s", baseObject.filename.c_str()); + LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s", baseObject.musicFilename.c_str()); - MWBase::Environment::get().getSoundManager()->streamMusic(baseObject.filename); + MWBase::Environment::get().getSoundManager()->streamMusic(baseObject.musicFilename); } } @@ -745,10 +745,10 @@ void ObjectList::playVideo() { for (const auto &baseObject : baseObjects) { - LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s, allowSkipping: %s", baseObject.filename.c_str(), + LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s, allowSkipping: %s", baseObject.videoFilename.c_str(), baseObject.allowSkipping ? "true" : "false"); - MWBase::Environment::get().getWindowManager()->playVideo(baseObject.filename, baseObject.allowSkipping); + MWBase::Environment::get().getWindowManager()->playVideo(baseObject.videoFilename, baseObject.allowSkipping); } } @@ -956,14 +956,14 @@ void ObjectList::addDoorState(const MWWorld::Ptr& ptr, int state) void ObjectList::addMusicPlay(std::string filename) { mwmp::BaseObject baseObject; - baseObject.filename = filename; + baseObject.musicFilename = filename; addObject(baseObject); } void ObjectList::addVideoPlay(std::string filename, bool allowSkipping) { mwmp::BaseObject baseObject; - baseObject.filename = filename; + baseObject.videoFilename = filename; baseObject.allowSkipping = allowSkipping; addObject(baseObject); } diff --git a/components/openmw-mp/Base/BaseObject.hpp b/components/openmw-mp/Base/BaseObject.hpp index a10efe3ec..3c4e143e8 100644 --- a/components/openmw-mp/Base/BaseObject.hpp +++ b/components/openmw-mp/Base/BaseObject.hpp @@ -43,7 +43,9 @@ namespace mwmp ESM::Cell destinationCell; ESM::Position destinationPosition; - std::string filename; + std::string musicFilename; + + std::string videoFilename; bool allowSkipping; std::string animGroup; diff --git a/components/openmw-mp/Packets/Object/PacketMusicPlay.cpp b/components/openmw-mp/Packets/Object/PacketMusicPlay.cpp index 2f5c0fc97..4b3f35513 100644 --- a/components/openmw-mp/Packets/Object/PacketMusicPlay.cpp +++ b/components/openmw-mp/Packets/Object/PacketMusicPlay.cpp @@ -10,5 +10,5 @@ PacketMusicPlay::PacketMusicPlay(RakNet::RakPeerInterface *peer) : ObjectPacket( void PacketMusicPlay::Object(BaseObject &baseObject, bool send) { - RW(baseObject.filename, send); + RW(baseObject.musicFilename, send); } diff --git a/components/openmw-mp/Packets/Object/PacketVideoPlay.cpp b/components/openmw-mp/Packets/Object/PacketVideoPlay.cpp index 5db172bf9..a080788a5 100644 --- a/components/openmw-mp/Packets/Object/PacketVideoPlay.cpp +++ b/components/openmw-mp/Packets/Object/PacketVideoPlay.cpp @@ -10,6 +10,6 @@ PacketVideoPlay::PacketVideoPlay(RakNet::RakPeerInterface *peer) : ObjectPacket( void PacketVideoPlay::Object(BaseObject &baseObject, bool send) { - RW(baseObject.filename, send); + RW(baseObject.videoFilename, send); RW(baseObject.allowSkipping, send); }