[General] Remove redundant code

Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls

apps/openmw-mp/Cell.cpp

@@ -15,7 +15,7 @@ using namespace std;
 
 Cell::Cell(ESM::Cell cell) : cell(cell)
 {
-    cellActorList.count = 0;
+
 }
 
 Cell::Iterator Cell::begin() const
@@ -109,8 +109,6 @@ void Cell::readActorList(unsigned char packetID, const mwmp::BaseActorList *newA
         else
             cellActorList.baseActors.push_back(newActor);
     }
-
-    cellActorList.count = cellActorList.baseActors.size();
 }
 
 bool Cell::containsActor(int refNumIndex, int mpNum)
@@ -155,8 +153,6 @@ void Cell::removeActors(const mwmp::BaseActorList &newActorList)
         if (!foundActor)
             it++;
     }
-
-    cellActorList.count = cellActorList.baseActors.size();
 }
 
 RakNet::RakNetGUID *Cell::getAuthority()

apps/openmw-mp/processors/actor/ProcessorActorAI.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp

@@ -15,11 +15,11 @@ namespace mwmp
 
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {
-                serverCell->removeActors(&actorList);
+                serverCell->removeActors(actorList);
 
                 std::vector<std::shared_ptr<Actor>> actors;
 

apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {

apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp

@@ -16,7 +16,7 @@ namespace mwmp
         void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
         {
             // Send only to players who have the cell loaded
-            Cell *serverCell = CellController::get().getCell(&actorList.cell);
+            Cell *serverCell = CellController::get().getCell(actorList.cell);
 
             if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {

apps/openmw-mp/processors/world/ProcessorContainer.hpp

@@ -23,9 +23,9 @@ namespace mwmp
             // Until we have a timestamp-based system, send packets pertaining to more
             // than one container (i.e. replies to server requests for container contents)
             // only to players who have the container's cell loaded
-            if (event.action == BaseEvent::SET && event.worldObjectCount > 1)
+            if (event.action == BaseEvent::SET && event.worldObjects.size() > 1)
             {
-                Cell *serverCell = CellController::get().getCell(&event.cell);
+                Cell *serverCell = CellController::get().getCell(event.cell);
 
                 if (serverCell != nullptr)
                     serverCell->sendToLoaded(&packet, &event);

apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp

@@ -18,10 +18,8 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());
 
-            for (unsigned int i = 0; i < event.worldObjectCount; i++)
+            for (auto & object : event.worldObjects)
-            {
+                object.mpNum = mwmp::Networking::getPtr()->incrementMpNum();
-                event.worldObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
-            }
 
             // Send this packet back to the original sender with the mpNum generation from above,
             // then send it to the other players

apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp

@@ -18,10 +18,8 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());
 
-            for (unsigned int i = 0; i < event.worldObjectCount; i++)
+            for (auto & object : event.worldObjects)
-            {
+                object.mpNum = mwmp::Networking::getPtr()->incrementMpNum();
-                event.worldObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
-            }
 
             // Send this packet back to the original sender with the mpNum generation from above,
             // then send it to the other players

components/openmw-mp/Base/BaseActor.hpp

@@ -59,8 +59,6 @@ namespace mwmp
 
         std::vector<std::shared_ptr<BaseActor>> baseActors;
 
-        unsigned int count;
-
         ESM::Cell cell;
 
         unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items

components/openmw-mp/Base/BaseEvent.hpp

@@ -82,7 +82,6 @@ namespace mwmp
         RakNet::RakNetGUID guid;
         
         std::vector<WorldObject> worldObjects;
-        unsigned int worldObjectCount;
 
         ESM::Cell cell;
 

components/openmw-mp/Packets/Actor/ActorPacket.cpp

@@ -25,23 +25,13 @@ void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
     if (!PacketHeader(bs, send))
         return;
 
-    BaseActor *actor;
+    for(auto &actor : actorList->baseActors)
-
-    for (unsigned int i = 0; i < actorList->count; i++)
     {
-        if (send)
-            actor = actorList->baseActors.at(i).get();
-        else
-            actor = new BaseActor();
-
         RW(actor->refNumIndex, send);
         RW(actor->mpNum, send);
-
         Actor(*actor, send);
-
-        if (!send)
-            actorList->baseActors.push_back(std::shared_ptr<BaseActor>(actor));
     }
+
 }
 
 bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
@@ -51,14 +41,19 @@ bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
     RW(actorList->cell.mData, send, true);
     RW(actorList->cell.mName, send, true);
 
+    uint32_t actorCount;
     if (send)
-        actorList->count = (unsigned int)(actorList->baseActors.size());
+        actorCount = (uint32_t)(actorList->baseActors.size());
-    else
+
-        actorList->baseActors.clear();
+    RW(actorCount, send);
 
-    RW(actorList->count, send);
+    if(!send)
+    {
+        actorList->baseActors.clear();
+        actorList->baseActors.resize(actorCount, std::make_shared<BaseActor>());
+    }
 
-    if (actorList->count > maxActors)
+    if (actorCount > maxActors)
     {
         actorList->isValid = false;
         return false;

components/openmw-mp/Packets/Actor/PacketActorList.cpp

@@ -15,15 +15,8 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
 
     RW(actorList->action, send);
 
-    BaseActor *actor;
+    for(auto &actor : actorList->baseActors)
-
-    for (unsigned int i = 0; i < actorList->count; i++)
     {
-        if (send)
-            actor = actorList->baseActors.at(i).get();
-        else
-            actor = new BaseActor();
-
         RW(actor->refId, send);
         RW(actor->refNumIndex, send);
         RW(actor->mpNum, send);
@@ -33,8 +26,5 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
             actorList->isValid = false;
             return;
         }
-
-        if (!send)
-            actorList->baseActors.push_back(std::shared_ptr<BaseActor>(actor));
     }
 }

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

@@ -36,14 +36,14 @@ bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
 {
     BasePacket::Packet(bs, send);
 
+    uint32_t worldObjectCount;
+
     if (send)
-        event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+        worldObjectCount = (uint32_t) (event->worldObjects.size());
-    else
-        event->worldObjects.clear();
 
-    RW(event->worldObjectCount, send);
+    RW(worldObjectCount, send);
 
-    if (event->worldObjectCount > maxObjects)
+    if (worldObjectCount > maxObjects)
     {
         event->isValid = false;
         return false;
@@ -51,7 +51,8 @@ bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
 
     if (!send)
     {
-        event->worldObjects.resize(event->worldObjectCount);
+        event->worldObjects.clear();
+        event->worldObjects.resize(worldObjectCount);
     }
 
     if (hasCellData)