[Client] Fix initialization of ptrCellStore in object processors

5 years ago · b527ca7e5d
parent 62df188fd4
commit b527ca7e5d
22 changed files with 84 additions and 6 deletions
--- a/apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
+++ b/apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
@ -13,10 +13,6 @@ namespace mwmp
    public:
        virtual void Do(ObjectPacket &packet, ObjectList &objectList)
        {
-            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
-
-            if (!ptrCellStore) return;
-
            LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s about %s", strPacketID.c_str(), objectList.cell.getDescription().c_str());
        }
    protected:
--- a/apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.setClientLocals(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.runConsoleCommands(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            std::string debugMessage = "- action ";
            unsigned char action = objectList.action;
            unsigned char containerSubAction = objectList.containerSubAction;
--- a/apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.setDoorDestinations(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.activateDoors(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectActivate.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectActivate.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.activateObjects(ptrCellStore);
        }

--- a/apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.animateObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            //objectList.attachObjects(ptrCellStore);
        }

--- a/apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.deleteObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectHit.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectHit.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            //objectList.hitObjects(ptrCellStore);
        }

--- a/apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.lockObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp
@ -15,10 +15,12 @@ namespace mwmp

        virtual void Do(ObjectPacket &packet, ObjectList &objectList)
        {
-            LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s", strPacketID.c_str());
-
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.setGoldPoolsForObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.moveObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.placeObjects(ptrCellStore);
        }

--- a/apps/openmw/mwmp/processors/object/ProcessorObjectRestock.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectRestock.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.restockObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.rotateObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.scaleObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.playObjectSounds(ptrCellStore);
        }

--- a/apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.spawnObjects(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.setObjectStates(ptrCellStore);
        }
    };
--- a/apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp
@ -17,6 +17,10 @@ namespace mwmp
        {
            BaseObjectProcessor::Do(packet, objectList);

+            ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
+
+            if (!ptrCellStore) return;
+
            objectList.triggerTrapObjects(ptrCellStore);
        }
    };