[General] Rename ID_CONTAINER_ADD into ID_CONTAINER

apps/openmw-mp/Networking.cpp

@@ -537,9 +537,9 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
         break;
     }
 
-    case ID_CONTAINER_ADD:
+    case ID_CONTAINER:
     {
-        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER_ADD from %s",
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER from %s",
             player->npc.mName.c_str());
 
         myPacket->Read(worldEvent);

components/CMakeLists.txt

@@ -165,7 +165,7 @@ add_component_dir (openmw-mp
         Packets/World/PacketObjectHealth Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock
         Packets/World/PacketObjectMove Packets/World/PacketObjectRotate Packets/World/PacketObjectAnimPlay
 
-        Packets/World/PacketContainerAdd Packets/World/PacketDoorState Packets/World/PacketMusicPlay
+        Packets/World/PacketContainer Packets/World/PacketDoorState Packets/World/PacketMusicPlay
         Packets/World/PacketVideoPlay
 
         Packets/World/PacketScriptLocalShort Packets/World/PacketScriptLocalFloat Packets/World/PacketScriptMemberShort

components/openmw-mp/Controllers/WorldPacketController.cpp

@@ -4,15 +4,15 @@
 
 #include "../Packets/World/PacketObjectDelete.hpp"
 #include "../Packets/World/PacketObjectPlace.hpp"
+#include "../Packets/World/PacketObjectScale.hpp"
+#include "../Packets/World/PacketObjectHealth.hpp"
 #include "../Packets/World/PacketObjectLock.hpp"
 #include "../Packets/World/PacketObjectUnlock.hpp"
-#include "../Packets/World/PacketObjectScale.hpp"
 #include "../Packets/World/PacketObjectMove.hpp"
 #include "../Packets/World/PacketObjectRotate.hpp"
 #include "../Packets/World/PacketObjectAnimPlay.hpp"
 
-#include "../Packets/World/PacketContainerAdd.hpp"
+#include "../Packets/World/PacketContainer.hpp"
-#include "../Packets/World/PacketObjectHealth.hpp"
 #include "../Packets/World/PacketDoorState.hpp"
 #include "../Packets/World/PacketMusicPlay.hpp"
 #include "../Packets/World/PacketVideoPlay.hpp"
@@ -36,15 +36,15 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
 {
     AddPacket<PacketObjectDelete>(&packets, peer);
     AddPacket<PacketObjectPlace>(&packets, peer);
+    AddPacket<PacketObjectScale>(&packets, peer);
+    AddPacket<PacketObjectHealth>(&packets, peer);
     AddPacket<PacketObjectLock>(&packets, peer);
     AddPacket<PacketObjectUnlock>(&packets, peer);
-    AddPacket<PacketObjectScale>(&packets, peer);
     AddPacket<PacketObjectMove>(&packets, peer);
     AddPacket<PacketObjectRotate>(&packets, peer);
     AddPacket<PacketObjectAnimPlay>(&packets, peer);
 
-    AddPacket<PacketContainerAdd>(&packets, peer);
+    AddPacket<PacketContainer>(&packets, peer);
-    AddPacket<PacketObjectHealth>(&packets, peer);
     AddPacket<PacketDoorState>(&packets, peer);
     AddPacket<PacketMusicPlay>(&packets, peer);
     AddPacket<PacketVideoPlay>(&packets, peer);

components/openmw-mp/NetworkMessages.hpp

@@ -49,7 +49,7 @@ enum GameMessages
     ID_OBJECT_ROTATE,
     ID_OBJECT_ANIM_PLAY,
 
-    ID_CONTAINER_ADD,
+    ID_CONTAINER,
     ID_DOOR_STATE,
     ID_MUSIC_PLAY,
     ID_VIDEO_PLAY,

components/openmw-mp/Packets/World/PacketContainer.cpp

@@ -0,0 +1,14 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketContainer.hpp"
+
+using namespace mwmp;
+
+PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_CONTAINER;
+}
+
+void PacketContainer::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+}

components/openmw-mp/Packets/World/PacketContainer.hpp

@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETCONTAINER_HPP
+#define OPENMW_PACKETCONTAINER_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketContainer : public WorldPacket
+    {
+    public:
+        PacketContainer(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, WorldEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETCONTAINER_HPP

components/openmw-mp/Packets/World/PacketContainerAdd.cpp

@@ -1,14 +0,0 @@
-#include <components/openmw-mp/NetworkMessages.hpp>
-#include "PacketContainerAdd.hpp"
-
-using namespace mwmp;
-
-PacketContainerAdd::PacketContainerAdd(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
-{
-    packetID = ID_CONTAINER_ADD;
-}
-
-void PacketContainerAdd::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
-{
-    WorldPacket::Packet(bs, event, send);
-}

components/openmw-mp/Packets/World/PacketContainerAdd.hpp

@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETCONTAINERADD_HPP
-#define OPENMW_PACKETCONTAINERADD_HPP
-
-#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
-
-namespace mwmp
-{
-    class PacketContainerAdd : public WorldPacket
-    {
-    public:
-        PacketContainerAdd(RakNet::RakPeerInterface *peer);
-
-        virtual void Packet(RakNet::BitStream *bs, WorldEvent *event, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETCONTAINERADD_HPP