[Client] Fix initialization of ptrCellStore in object processors

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:

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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