mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 19:36:43 +00:00
Code Issues Releases Wiki Activity

[Client] Fix initialization of ptrCellStore in object processors

Browse source
This commit is contained in:
David Cernat 2020-06-06 23:11:16 +03:00
parent 62df188fd4
commit b527ca7e5d
22 changed files with 84 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
View file

@ -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:

4
apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.setClientLocals(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.runConsoleCommands(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorContainer.hpp
View file

@ -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;

4
apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.setDoorDestinations(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.activateDoors(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectActivate.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.activateObjects(ptrCellStore);
}

4
apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.animateObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
//objectList.attachObjects(ptrCellStore);
}

4
apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.deleteObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectHit.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
//objectList.hitObjects(ptrCellStore);
}

4
apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.lockObjects(ptrCellStore);
}
};

6
apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp
View file

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

4
apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.moveObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.placeObjects(ptrCellStore);
}

4
apps/openmw/mwmp/processors/object/ProcessorObjectRestock.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.restockObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.rotateObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.scaleObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.playObjectSounds(ptrCellStore);
}

4
apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.spawnObjects(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.setObjectStates(ptrCellStore);
}
};

4
apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp
View file

@ -17,6 +17,10 @@ namespace mwmp
{
BaseObjectProcessor::Do(packet, objectList);
ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
if (!ptrCellStore) return;
objectList.triggerTrapObjects(ptrCellStore);
}
};