diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index a4c34b542..c1699ffe1 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -130,9 +130,9 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination ProcessorDoorState ProcessorMusicPlay ProcessorVideoPlay - ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectCollision ProcessorObjectDelete - ProcessorObjectHit ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock - ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap + ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectDelete ProcessorObjectHit + ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock ProcessorObjectRotate + ProcessorObjectScale ProcessorObjectSound ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap ProcessorScriptLocalShort ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptMemberFloat ) diff --git a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp index 359c0a48c..d868346a6 100644 --- a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -55,7 +55,6 @@ #include "object/ProcessorObjectActivate.hpp" #include "object/ProcessorObjectAnimPlay.hpp" #include "object/ProcessorObjectAttach.hpp" -#include "object/ProcessorObjectCollision.hpp" #include "object/ProcessorObjectDelete.hpp" #include "object/ProcessorObjectHit.hpp" #include "object/ProcessorObjectLock.hpp" @@ -64,6 +63,7 @@ #include "object/ProcessorObjectRestock.hpp" #include "object/ProcessorObjectRotate.hpp" #include "object/ProcessorObjectScale.hpp" +#include "object/ProcessorObjectSound.hpp" #include "object/ProcessorObjectSpawn.hpp" #include "object/ProcessorObjectState.hpp" #include "object/ProcessorObjectTrap.hpp" @@ -158,7 +158,6 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectActivate()); ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay()); ObjectProcessor::AddProcessor(new ProcessorObjectAttach()); - ObjectProcessor::AddProcessor(new ProcessorObjectCollision()); ObjectProcessor::AddProcessor(new ProcessorObjectDelete()); ObjectProcessor::AddProcessor(new ProcessorObjectHit()); ObjectProcessor::AddProcessor(new ProcessorObjectLock()); @@ -167,6 +166,7 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectRestock()); ObjectProcessor::AddProcessor(new ProcessorObjectRotate()); ObjectProcessor::AddProcessor(new ProcessorObjectScale()); + ObjectProcessor::AddProcessor(new ProcessorObjectSound()); ObjectProcessor::AddProcessor(new ProcessorObjectSpawn()); ObjectProcessor::AddProcessor(new ProcessorObjectState()); ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); diff --git a/apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp deleted file mode 100644 index bdbf4d958..000000000 --- a/apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef OPENMW_PROCESSOROBJECTCOLLISION_HPP -#define OPENMW_PROCESSOROBJECTCOLLISION_HPP - -#include "BaseObjectProcessor.hpp" - -namespace mwmp -{ - class ProcessorObjectCollision final: public BaseObjectProcessor - { - public: - ProcessorObjectCollision() - { - BPP_INIT(ID_OBJECT_COLLISION) - } - - virtual void Do(ObjectPacket &packet, ObjectList &objectList) - { - BaseObjectProcessor::Do(packet, objectList); - - //objectList.setObjectCollisions(ptrCellStore); - } - - }; -} - -#endif //OPENMW_PROCESSOROBJECTCOLLISION_HPP diff --git a/apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp new file mode 100644 index 000000000..7fd372b72 --- /dev/null +++ b/apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp @@ -0,0 +1,26 @@ +#ifndef OPENMW_PROCESSOROBJECTSOUND_HPP +#define OPENMW_PROCESSOROBJECTSOUND_HPP + +#include "BaseObjectProcessor.hpp" + +namespace mwmp +{ + class ProcessorObjectSound final: public BaseObjectProcessor + { + public: + ProcessorObjectSound() + { + BPP_INIT(ID_OBJECT_SOUND) + } + + virtual void Do(ObjectPacket &packet, ObjectList &objectList) + { + BaseObjectProcessor::Do(packet, objectList); + + //objectList.setObjectSounds(ptrCellStore); + } + + }; +} + +#endif //OPENMW_PROCESSOROBJECTSOUND_HPP diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 26868ddf6..0db7a20e8 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -205,8 +205,8 @@ add_component_dir (openmw-mp/Packets/Object PacketDoorDestination PacketDoorState PacketConsoleCommand PacketContainer PacketObjectActivate PacketObjectAnimPlay PacketObjectAttach - PacketObjectCollision PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace - PacketObjectRestock PacketObjectRotate PacketObjectScale PacketObjectSpawn PacketObjectState PacketObjectTrap + PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace PacketObjectRestock + PacketObjectRotate PacketObjectScale PacketObjectSound PacketObjectSpawn PacketObjectState PacketObjectTrap PacketMusicPlay PacketVideoPlay PacketScriptLocalShort PacketScriptLocalFloat PacketScriptMemberShort PacketScriptMemberFloat ) diff --git a/components/openmw-mp/Controllers/ObjectPacketController.cpp b/components/openmw-mp/Controllers/ObjectPacketController.cpp index f448fe232..f789ce631 100644 --- a/components/openmw-mp/Controllers/ObjectPacketController.cpp +++ b/components/openmw-mp/Controllers/ObjectPacketController.cpp @@ -1,7 +1,6 @@ #include "../Packets/Object/PacketObjectActivate.hpp" #include "../Packets/Object/PacketObjectAnimPlay.hpp" #include "../Packets/Object/PacketObjectAttach.hpp" -#include "../Packets/Object/PacketObjectCollision.hpp" #include "../Packets/Object/PacketObjectDelete.hpp" #include "../Packets/Object/PacketObjectHit.hpp" #include "../Packets/Object/PacketObjectLock.hpp" @@ -10,6 +9,7 @@ #include "../Packets/Object/PacketObjectRestock.hpp" #include "../Packets/Object/PacketObjectRotate.hpp" #include "../Packets/Object/PacketObjectScale.hpp" +#include "../Packets/Object/PacketObjectSound.hpp" #include "../Packets/Object/PacketObjectSpawn.hpp" #include "../Packets/Object/PacketObjectState.hpp" #include "../Packets/Object/PacketObjectTrap.hpp" @@ -41,7 +41,6 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); - AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); @@ -50,6 +49,7 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); + AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp index 4c6ad95aa..e3d0c8971 100644 --- a/components/openmw-mp/NetworkMessages.hpp +++ b/components/openmw-mp/NetworkMessages.hpp @@ -70,7 +70,7 @@ enum GameMessages ID_OBJECT_ACTIVATE, ID_OBJECT_ANIM_PLAY, ID_OBJECT_ATTACH, - ID_OBJECT_COLLISION, + ID_OBJECT_SOUND, ID_OBJECT_DELETE, ID_OBJECT_LOCK, ID_OBJECT_MOVE, diff --git a/components/openmw-mp/Packets/Object/PacketObjectCollision.cpp b/components/openmw-mp/Packets/Object/PacketObjectCollision.cpp deleted file mode 100644 index fbf1e339d..000000000 --- a/components/openmw-mp/Packets/Object/PacketObjectCollision.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include "PacketObjectCollision.hpp" - -using namespace mwmp; - -PacketObjectCollision::PacketObjectCollision(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) -{ - packetID = ID_OBJECT_COLLISION; - hasCellData = true; -} - -void PacketObjectCollision::Object(BaseObject &baseObject, bool send) -{ - ObjectPacket::Object(baseObject, send); - // Placeholder -} diff --git a/components/openmw-mp/Packets/Object/PacketObjectCollision.hpp b/components/openmw-mp/Packets/Object/PacketObjectCollision.hpp deleted file mode 100644 index ddaca261e..000000000 --- a/components/openmw-mp/Packets/Object/PacketObjectCollision.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENMW_PACKETOBJECTCOLLISION_HPP -#define OPENMW_PACKETOBJECTCOLLISION_HPP - -#include - -namespace mwmp -{ - class PacketObjectCollision : public ObjectPacket - { - public: - PacketObjectCollision(RakNet::RakPeerInterface *peer); - - virtual void Object(BaseObject &baseObject, bool send); - }; -} - -#endif //OPENMW_PACKETOBJECTCOLLISION_HPP diff --git a/components/openmw-mp/Packets/Object/PacketObjectSound.cpp b/components/openmw-mp/Packets/Object/PacketObjectSound.cpp new file mode 100644 index 000000000..3b6a920ee --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketObjectSound.cpp @@ -0,0 +1,16 @@ +#include +#include "PacketObjectSound.hpp" + +using namespace mwmp; + +PacketObjectSound::PacketObjectSound(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) +{ + packetID = ID_OBJECT_SOUND; + hasCellData = true; +} + +void PacketObjectSound::Object(BaseObject &baseObject, bool send) +{ + ObjectPacket::Object(baseObject, send); + // Placeholder +} diff --git a/components/openmw-mp/Packets/Object/PacketObjectSound.hpp b/components/openmw-mp/Packets/Object/PacketObjectSound.hpp new file mode 100644 index 000000000..279c965aa --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketObjectSound.hpp @@ -0,0 +1,17 @@ +#ifndef OPENMW_PACKETOBJECTSOUND_HPP +#define OPENMW_PACKETOBJECTSOUND_HPP + +#include + +namespace mwmp +{ + class PacketObjectSound : public ObjectPacket + { + public: + PacketObjectSound(RakNet::RakPeerInterface *peer); + + virtual void Object(BaseObject &baseObject, bool send); + }; +} + +#endif //OPENMW_PACKETOBJECTSOUND_HPP