[General] Rename unused ObjectReset packet into ObjectHit

apps/openmw/CMakeLists.txt

@@ -128,7 +128,7 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor
     ProcessorVideoPlay
 
     ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach  ProcessorObjectCollision ProcessorObjectDelete
-    ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectReset ProcessorObjectRotate
+    ProcessorObjectHit ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRotate
     ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap ProcessorScriptLocalShort
     ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptMemberFloat ProcessorScriptGlobalShort
     ProcessorScriptGlobalFloat

apps/openmw/mwmp/processors/ProcessorInitializer.cpp

@@ -55,10 +55,10 @@
 #include "object/ProcessorObjectAttach.hpp"
 #include "object/ProcessorObjectCollision.hpp"
 #include "object/ProcessorObjectDelete.hpp"
+#include "object/ProcessorObjectHit.hpp"
 #include "object/ProcessorObjectLock.hpp"
 #include "object/ProcessorObjectMove.hpp"
 #include "object/ProcessorObjectPlace.hpp"
-#include "object/ProcessorObjectReset.hpp"
 #include "object/ProcessorObjectRotate.hpp"
 #include "object/ProcessorObjectScale.hpp"
 #include "object/ProcessorObjectSpawn.hpp"
@@ -155,10 +155,10 @@ void ProcessorInitializer()
     ObjectProcessor::AddProcessor(new ProcessorObjectAttach());
     ObjectProcessor::AddProcessor(new ProcessorObjectCollision());
     ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
+    ObjectProcessor::AddProcessor(new ProcessorObjectHit());
     ObjectProcessor::AddProcessor(new ProcessorObjectLock());
     ObjectProcessor::AddProcessor(new ProcessorObjectMove());
     ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
-    ObjectProcessor::AddProcessor(new ProcessorObjectReset());
     ObjectProcessor::AddProcessor(new ProcessorObjectRotate());
     ObjectProcessor::AddProcessor(new ProcessorObjectScale());
     ObjectProcessor::AddProcessor(new ProcessorObjectSpawn());

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

@@ -0,0 +1,26 @@
+#ifndef OPENMW_PROCESSOROBJECTHIT_HPP
+#define OPENMW_PROCESSOROBJECTHIT_HPP
+
+#include "BaseObjectProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorObjectHit : public BaseObjectProcessor
+    {
+    public:
+        ProcessorObjectHit()
+        {
+            BPP_INIT(ID_OBJECT_HIT)
+        }
+
+        virtual void Do(ObjectPacket &packet, ObjectList &objectList)
+        {
+            BaseObjectProcessor::Do(packet, objectList);
+
+            //objectList.hitObjects(ptrCellStore);
+        }
+
+    };
+}
+
+#endif //OPENMW_PROCESSOROBJECTHIT_HPP

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

@@ -1,26 +0,0 @@
-#ifndef OPENMW_PROCESSOROBJECTRESET_HPP
-#define OPENMW_PROCESSOROBJECTRESET_HPP
-
-#include "BaseObjectProcessor.hpp"
-
-namespace mwmp
-{
-    class ProcessorObjectReset : public BaseObjectProcessor
-    {
-    public:
-        ProcessorObjectReset()
-        {
-            BPP_INIT(ID_OBJECT_RESET)
-        }
-
-        virtual void Do(ObjectPacket &packet, ObjectList &objectList)
-        {
-            BaseObjectProcessor::Do(packet, objectList);
-
-            //objectList.resetObjects(ptrCellStore);
-        }
-
-    };
-}
-
-#endif //OPENMW_PROCESSOROBJECTRESET_HPP

components/CMakeLists.txt

@@ -196,12 +196,13 @@ add_component_dir (openmw-mp/Packets/Player
 add_component_dir (openmw-mp/Packets/Object
         ObjectPacket
 
+        PacketDoorDestination PacketDoorState
+
         PacketConsoleCommand PacketContainer PacketObjectActivate PacketObjectAnimPlay PacketObjectAttach
-        PacketObjectCollision PacketObjectDelete PacketDoorDestination PacketDoorState PacketObjectLock
+        PacketObjectCollision PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace
-        PacketObjectMove PacketObjectPlace PacketObjectReset PacketObjectRotate PacketObjectScale
+        PacketObjectRotate PacketObjectScale PacketObjectSpawn PacketObjectState PacketObjectTrap PacketMusicPlay
-        PacketObjectSpawn PacketObjectState PacketObjectTrap PacketMusicPlay PacketVideoPlay PacketScriptLocalShort
+        PacketVideoPlay PacketScriptLocalShort PacketScriptLocalFloat PacketScriptMemberShort PacketScriptMemberFloat
-        PacketScriptLocalFloat PacketScriptMemberShort PacketScriptMemberFloat PacketScriptGlobalShort
+        PacketScriptGlobalShort PacketScriptGlobalFloat
-        PacketScriptGlobalFloat
         )
 
 add_component_dir (openmw-mp/Packets/Worldstate

components/openmw-mp/Controllers/ObjectPacketController.cpp

@@ -3,10 +3,10 @@
 #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"
 #include "../Packets/Object/PacketObjectMove.hpp"
 #include "../Packets/Object/PacketObjectPlace.hpp"
-#include "../Packets/Object/PacketObjectReset.hpp"
 #include "../Packets/Object/PacketObjectRotate.hpp"
 #include "../Packets/Object/PacketObjectScale.hpp"
 #include "../Packets/Object/PacketObjectSpawn.hpp"
@@ -44,10 +44,10 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketObjectAttach>(&packets, peer);
     AddPacket<PacketObjectCollision>(&packets, peer);
     AddPacket<PacketObjectDelete>(&packets, peer);
+    AddPacket<PacketObjectHit>(&packets, peer);
     AddPacket<PacketObjectLock>(&packets, peer);
     AddPacket<PacketObjectMove>(&packets, peer);
     AddPacket<PacketObjectPlace>(&packets, peer);
-    AddPacket<PacketObjectReset>(&packets, peer);
     AddPacket<PacketObjectRotate>(&packets, peer);
     AddPacket<PacketObjectScale>(&packets, peer);
     AddPacket<PacketObjectSpawn>(&packets, peer);

components/openmw-mp/NetworkMessages.hpp

@@ -75,7 +75,7 @@ enum GameMessages
     ID_OBJECT_LOCK,
     ID_OBJECT_MOVE,
     ID_OBJECT_PLACE,
-    ID_OBJECT_RESET,
+    ID_OBJECT_HIT,
     ID_OBJECT_ROTATE,
     ID_OBJECT_SCALE,
     ID_OBJECT_SPAWN,

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

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

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

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

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

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

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

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