diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index 0d467dfe6..c7cec52c1 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -117,13 +117,13 @@ set(PROCESSORS_OBJECT processors/object/ProcessorDoorState.hpp processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectActivate.hpp processors/object/ProcessorObjectAnimPlay.hpp processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectHit.hpp - processors/object/ProcessorObjectLock.hpp processors/object/ProcessorObjectMove.hpp - processors/object/ProcessorObjectPlace.hpp processors/object/ProcessorObjectRestock.hpp - processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp - processors/object/ProcessorObjectSound.hpp processors/object/ProcessorObjectSpawn.hpp - processors/object/ProcessorObjectState.hpp processors/object/ProcessorObjectTrap.hpp - processors/object/ProcessorClientScriptLocal.hpp processors/object/ProcessorScriptMemberShort.hpp - processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorVideoPlay.hpp + processors/object/ProcessorObjectLock.hpp processors/object/ProcessorObjectMiscellaneous.hpp + processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.hpp + processors/object/ProcessorObjectRestock.hpp processors/object/ProcessorObjectRotate.hpp + processors/object/ProcessorObjectScale.hpp processors/object/ProcessorObjectSound.hpp + processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp + processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorClientScriptLocal.hpp + processors/object/ProcessorScriptMemberShort.hpp processors/object/ProcessorVideoPlay.hpp ) source_group(tes3mp-server\\processors\\object FILES ${PROCESSORS_OBJECT}) diff --git a/apps/openmw-mp/processors/ProcessorInitializer.cpp b/apps/openmw-mp/processors/ProcessorInitializer.cpp index c0e9d6c29..6a25150c4 100644 --- a/apps/openmw-mp/processors/ProcessorInitializer.cpp +++ b/apps/openmw-mp/processors/ProcessorInitializer.cpp @@ -64,6 +64,7 @@ #include "object/ProcessorObjectHit.hpp" #include "object/ProcessorObjectPlace.hpp" #include "object/ProcessorObjectLock.hpp" +#include "object/ProcessorObjectMiscellaneous.hpp" #include "object/ProcessorObjectMove.hpp" #include "object/ProcessorObjectRestock.hpp" #include "object/ProcessorObjectRotate.hpp" @@ -74,7 +75,6 @@ #include "object/ProcessorObjectTrap.hpp" #include "object/ProcessorClientScriptLocal.hpp" #include "object/ProcessorScriptMemberShort.hpp" -#include "object/ProcessorScriptMemberFloat.hpp" #include "object/ProcessorVideoPlay.hpp" #include "WorldstateProcessor.hpp" #include "worldstate/ProcessorClientScriptGlobal.hpp" @@ -146,6 +146,7 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectDelete()); ObjectProcessor::AddProcessor(new ProcessorObjectHit()); ObjectProcessor::AddProcessor(new ProcessorObjectLock()); + ObjectProcessor::AddProcessor(new ProcessorObjectMiscellaneous()); ObjectProcessor::AddProcessor(new ProcessorObjectMove()); ObjectProcessor::AddProcessor(new ProcessorObjectPlace()); ObjectProcessor::AddProcessor(new ProcessorObjectRestock()); @@ -157,7 +158,6 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort()); - ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat()); ObjectProcessor::AddProcessor(new ProcessorVideoPlay()); WorldstateProcessor::AddProcessor(new ProcessorClientScriptGlobal()); diff --git a/apps/openmw-mp/processors/object/ProcessorObjectMiscellaneous.hpp b/apps/openmw-mp/processors/object/ProcessorObjectMiscellaneous.hpp new file mode 100644 index 000000000..029c7d0a8 --- /dev/null +++ b/apps/openmw-mp/processors/object/ProcessorObjectMiscellaneous.hpp @@ -0,0 +1,18 @@ +#ifndef OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP +#define OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP + +#include "../ObjectProcessor.hpp" + +namespace mwmp +{ + class ProcessorObjectMiscellaneous : public ObjectProcessor + { + public: + ProcessorObjectMiscellaneous() + { + BPP_INIT(ID_OBJECT_MISCELLANEOUS) + } + }; +} + +#endif //OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP diff --git a/apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp b/apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp deleted file mode 100644 index 8ab558e8d..000000000 --- a/apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP -#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP - -#include "../ObjectProcessor.hpp" - -namespace mwmp -{ - class ProcessorScriptMemberFloat : public ObjectProcessor - { - public: - ProcessorScriptMemberFloat() - { - BPP_INIT(ID_SCRIPT_MEMBER_FLOAT) - } - }; -} - -#endif //OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index d0c1ed130..3bcdcd079 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -136,7 +136,7 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectDelete ProcessorObjectHit ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSound ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap - ProcessorClientScriptLocal ProcessorScriptMemberShort ProcessorScriptMemberFloat + ProcessorClientScriptLocal ProcessorScriptMemberShort ProcessorObjectMiscellaneous ) add_openmw_dir (mwmp/processors/worldstate ProcessorCellReset ProcessorClientScriptGlobal ProcessorClientScriptSettings diff --git a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp index a34d27780..ec47e5068 100644 --- a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -58,6 +58,7 @@ #include "object/ProcessorObjectDelete.hpp" #include "object/ProcessorObjectHit.hpp" #include "object/ProcessorObjectLock.hpp" +#include "object/ProcessorObjectMiscellaneous.hpp" #include "object/ProcessorObjectMove.hpp" #include "object/ProcessorObjectPlace.hpp" #include "object/ProcessorObjectRestock.hpp" @@ -69,7 +70,6 @@ #include "object/ProcessorObjectTrap.hpp" #include "object/ProcessorClientScriptLocal.hpp" #include "object/ProcessorScriptMemberShort.hpp" -#include "object/ProcessorScriptMemberFloat.hpp" #include "object/ProcessorVideoPlay.hpp" #include "ActorProcessor.hpp" @@ -160,6 +160,7 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectDelete()); ObjectProcessor::AddProcessor(new ProcessorObjectHit()); ObjectProcessor::AddProcessor(new ProcessorObjectLock()); + ObjectProcessor::AddProcessor(new ProcessorObjectMiscellaneous()); ObjectProcessor::AddProcessor(new ProcessorObjectMove()); ObjectProcessor::AddProcessor(new ProcessorObjectPlace()); ObjectProcessor::AddProcessor(new ProcessorObjectRestock()); @@ -171,7 +172,6 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort()); - ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat()); ObjectProcessor::AddProcessor(new ProcessorVideoPlay()); ActorProcessor::AddProcessor(new ProcessorActorAI()); diff --git a/apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp new file mode 100644 index 000000000..3b5458a31 --- /dev/null +++ b/apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp @@ -0,0 +1,23 @@ +#ifndef OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP +#define OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP + +#include "../ObjectProcessor.hpp" + +namespace mwmp +{ + class ProcessorObjectMiscellaneous final: public ObjectProcessor + { + public: + ProcessorObjectMiscellaneous() + { + BPP_INIT(ID_OBJECT_MISCELLANEOUS) + } + + virtual void Do(ObjectPacket &packet, ObjectList &objectList) + { + LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s", strPacketID.c_str()); + } + }; +} + +#endif //OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP diff --git a/apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp deleted file mode 100644 index bff314faf..000000000 --- a/apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP -#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP - -#include "../ObjectProcessor.hpp" - -namespace mwmp -{ - class ProcessorScriptMemberFloat final: public ObjectProcessor - { - public: - ProcessorScriptMemberFloat() - { - BPP_INIT(ID_SCRIPT_MEMBER_FLOAT) - } - - virtual void Do(ObjectPacket &packet, ObjectList &objectList) - { - LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s", strPacketID.c_str()); - //objectList.setMemberFloats(); - } - }; -} - -#endif //OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 1434a581b..89d813484 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -208,7 +208,7 @@ add_component_dir (openmw-mp/Packets/Object PacketConsoleCommand PacketContainer PacketObjectActivate PacketObjectAnimPlay PacketObjectAttach PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace PacketObjectRestock PacketObjectRotate PacketObjectScale PacketObjectSound PacketObjectSpawn PacketObjectState PacketObjectTrap - PacketMusicPlay PacketVideoPlay PacketClientScriptLocal PacketScriptMemberShort PacketScriptMemberFloat + PacketMusicPlay PacketVideoPlay PacketClientScriptLocal PacketScriptMemberShort PacketObjectMiscellaneous ) add_component_dir (openmw-mp/Packets/Worldstate diff --git a/components/openmw-mp/Controllers/ObjectPacketController.cpp b/components/openmw-mp/Controllers/ObjectPacketController.cpp index 9ebbb2380..7c369ad5f 100644 --- a/components/openmw-mp/Controllers/ObjectPacketController.cpp +++ b/components/openmw-mp/Controllers/ObjectPacketController.cpp @@ -4,6 +4,7 @@ #include "../Packets/Object/PacketObjectDelete.hpp" #include "../Packets/Object/PacketObjectHit.hpp" #include "../Packets/Object/PacketObjectLock.hpp" +#include "../Packets/Object/PacketObjectMiscellaneous.hpp" #include "../Packets/Object/PacketObjectMove.hpp" #include "../Packets/Object/PacketObjectPlace.hpp" #include "../Packets/Object/PacketObjectRestock.hpp" @@ -23,7 +24,6 @@ #include "../Packets/Object/PacketConsoleCommand.hpp" #include "../Packets/Object/PacketClientScriptLocal.hpp" #include "../Packets/Object/PacketScriptMemberShort.hpp" -#include "../Packets/Object/PacketScriptMemberFloat.hpp" #include "ObjectPacketController.hpp" @@ -43,6 +43,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); @@ -62,7 +63,6 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p 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 c564af5d3..70ebf0d61 100644 --- a/components/openmw-mp/NetworkMessages.hpp +++ b/components/openmw-mp/NetworkMessages.hpp @@ -92,7 +92,7 @@ enum GameMessages ID_CLIENT_SCRIPT_LOCAL, ID_SCRIPT_LOCAL_FLOAT, ID_SCRIPT_MEMBER_SHORT, - ID_SCRIPT_MEMBER_FLOAT, + ID_OBJECT_MISCELLANEOUS, ID_CLIENT_SCRIPT_GLOBAL, ID_OBJECT_RESTOCK, diff --git a/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.cpp b/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.cpp new file mode 100644 index 000000000..37757e8f4 --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.cpp @@ -0,0 +1,14 @@ +#include +#include "PacketObjectMiscellaneous.hpp" + +using namespace mwmp; + +PacketObjectMiscellaneous::PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) +{ + packetID = ID_OBJECT_MISCELLANEOUS; +} + +void PacketObjectMiscellaneous::Object(BaseObject &baseObject, bool send) +{ + +} diff --git a/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.hpp b/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.hpp new file mode 100644 index 000000000..bcaf557b0 --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.hpp @@ -0,0 +1,17 @@ +#ifndef OPENMW_PACKETOBJECTMISCELLANEOUS_HPP +#define OPENMW_PACKETOBJECTMISCELLANEOUS_HPP + +#include + +namespace mwmp +{ + class PacketObjectMiscellaneous : public ObjectPacket + { + public: + PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer); + + virtual void Object(BaseObject &obj, bool send); + }; +} + +#endif //OPENMW_PACKETOBJECTMISCELLANEOUS_HPP diff --git a/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp b/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp deleted file mode 100644 index eae7644c8..000000000 --- a/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include "PacketScriptMemberFloat.hpp" - -using namespace mwmp; - -PacketScriptMemberFloat::PacketScriptMemberFloat(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) -{ - packetID = ID_SCRIPT_MEMBER_FLOAT; -} - -void PacketScriptMemberFloat::Object(BaseObject &baseObject, bool send) -{ - RW(baseObject.refId, send); - RW(baseObject.index, send); - RW(baseObject.floatVal, send); -} diff --git a/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.hpp b/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.hpp deleted file mode 100644 index 270fed933..000000000 --- a/components/openmw-mp/Packets/Object/PacketScriptMemberFloat.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP -#define OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP - -#include - -namespace mwmp -{ - class PacketScriptMemberFloat : public ObjectPacket - { - public: - PacketScriptMemberFloat(RakNet::RakPeerInterface *peer); - - virtual void Object(BaseObject &obj, bool send); - }; -} - -#endif //OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP