[General] Rename unused ScriptMemberFloat packet to ObjectMiscellaneous

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/ProcessorObjectLock.hpp processors/object/ProcessorObjectMiscellaneous.hpp
-        processors/object/ProcessorObjectPlace.hpp processors/object/ProcessorObjectRestock.hpp
+        processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.hpp
-        processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp
+        processors/object/ProcessorObjectRestock.hpp processors/object/ProcessorObjectRotate.hpp
-        processors/object/ProcessorObjectSound.hpp processors/object/ProcessorObjectSpawn.hpp
+        processors/object/ProcessorObjectScale.hpp processors/object/ProcessorObjectSound.hpp
-        processors/object/ProcessorObjectState.hpp processors/object/ProcessorObjectTrap.hpp
+        processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp
-        processors/object/ProcessorClientScriptLocal.hpp processors/object/ProcessorScriptMemberShort.hpp
+        processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorClientScriptLocal.hpp
-        processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorVideoPlay.hpp
+        processors/object/ProcessorScriptMemberShort.hpp processors/object/ProcessorVideoPlay.hpp
         )
 
 source_group(tes3mp-server\\processors\\object FILES ${PROCESSORS_OBJECT})

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());

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

apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp

@@ -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

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

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());

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

apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp

@@ -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

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

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<PacketObjectDelete>(&packets, peer);
     AddPacket<PacketObjectHit>(&packets, peer);
     AddPacket<PacketObjectLock>(&packets, peer);
+    AddPacket<PacketObjectMiscellaneous>(&packets, peer);
     AddPacket<PacketObjectMove>(&packets, peer);
     AddPacket<PacketObjectPlace>(&packets, peer);
     AddPacket<PacketObjectRestock>(&packets, peer);
@@ -62,7 +63,6 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketConsoleCommand>(&packets, peer);
     AddPacket<PacketClientScriptLocal>(&packets, peer);
     AddPacket<PacketScriptMemberShort>(&packets, peer);
-    AddPacket<PacketScriptMemberFloat>(&packets, peer);
 }
 
 

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,
 

components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.cpp

@@ -0,0 +1,14 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectMiscellaneous.hpp"
+
+using namespace mwmp;
+
+PacketObjectMiscellaneous::PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
+{
+    packetID = ID_OBJECT_MISCELLANEOUS;
+}
+
+void PacketObjectMiscellaneous::Object(BaseObject &baseObject, bool send)
+{
+
+}

components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.hpp

@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTMISCELLANEOUS_HPP
+#define OPENMW_PACKETOBJECTMISCELLANEOUS_HPP
+
+#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectMiscellaneous : public ObjectPacket
+    {
+    public:
+        PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer);
+
+        virtual void Object(BaseObject &obj, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTMISCELLANEOUS_HPP

components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp

@@ -1,16 +0,0 @@
-#include <components/openmw-mp/NetworkMessages.hpp>
-#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);
-}

components/openmw-mp/Packets/Object/PacketScriptMemberFloat.hpp

@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP
-#define OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP
-
-#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
-
-namespace mwmp
-{
-    class PacketScriptMemberFloat : public ObjectPacket
-    {
-    public:
-        PacketScriptMemberFloat(RakNet::RakPeerInterface *peer);
-
-        virtual void Object(BaseObject &obj, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP