diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index a28cb8041..41780a00c 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -1,7 +1,3 @@ -// -// Created by koncord on 12.01.16. -// - #include "Player.hpp" #include "processors/ProcessorInitializer.hpp" #include @@ -397,17 +393,17 @@ WorldstatePacketController *Networking::getWorldstatePacketController() const return worldstatePacketController; } -BaseActorList *Networking::getLastActorList() +BaseActorList *Networking::getReceivedActorList() { return &baseActorList; } -BaseObjectList *Networking::getLastObjectList() +BaseObjectList *Networking::getReceivedObjectList() { return &baseObjectList; } -BaseWorldstate *Networking::getLastWorldstate() +BaseWorldstate *Networking::getReceivedWorldstate() { return &baseWorldstate; } diff --git a/apps/openmw-mp/Networking.hpp b/apps/openmw-mp/Networking.hpp index d378dced5..c1c003315 100644 --- a/apps/openmw-mp/Networking.hpp +++ b/apps/openmw-mp/Networking.hpp @@ -44,9 +44,9 @@ namespace mwmp ObjectPacketController *getObjectPacketController() const; WorldstatePacketController *getWorldstatePacketController() const; - BaseActorList *getLastActorList(); - BaseObjectList *getLastObjectList(); - BaseWorldstate *getLastWorldstate(); + BaseActorList *getReceivedActorList(); + BaseObjectList *getReceivedObjectList(); + BaseWorldstate *getReceivedWorldstate(); int getCurrentMpNum(); void setCurrentMpNum(int value); diff --git a/apps/openmw-mp/Script/Functions/Actors.cpp b/apps/openmw-mp/Script/Functions/Actors.cpp index da5fd8c38..5fa125d4f 100644 --- a/apps/openmw-mp/Script/Functions/Actors.cpp +++ b/apps/openmw-mp/Script/Functions/Actors.cpp @@ -22,7 +22,7 @@ static std::string tempCellDescription; void ActorFunctions::ReadReceivedActorList() noexcept { - readActorList = mwmp::Networking::getPtr()->getLastActorList(); + readActorList = mwmp::Networking::getPtr()->getReceivedActorList(); } void ActorFunctions::ReadCellActorList(const char* cellDescription) noexcept diff --git a/apps/openmw-mp/Script/Functions/Objects.cpp b/apps/openmw-mp/Script/Functions/Objects.cpp index 58981d9b0..e6226482c 100644 --- a/apps/openmw-mp/Script/Functions/Objects.cpp +++ b/apps/openmw-mp/Script/Functions/Objects.cpp @@ -21,7 +21,7 @@ const ContainerItem emptyContainerItem = {}; void ObjectFunctions::ReadReceivedObjectList() noexcept { - readObjectList = mwmp::Networking::getPtr()->getLastObjectList(); + readObjectList = mwmp::Networking::getPtr()->getReceivedObjectList(); } void ObjectFunctions::ClearObjectList() noexcept diff --git a/apps/openmw-mp/Script/Functions/Worldstate.cpp b/apps/openmw-mp/Script/Functions/Worldstate.cpp index 3104c08ec..85fcf7870 100644 --- a/apps/openmw-mp/Script/Functions/Worldstate.cpp +++ b/apps/openmw-mp/Script/Functions/Worldstate.cpp @@ -16,7 +16,7 @@ BaseWorldstate *readWorldstate; void WorldstateFunctions::ReadReceivedWorldstate() noexcept { - readWorldstate = mwmp::Networking::getPtr()->getLastWorldstate(); + readWorldstate = mwmp::Networking::getPtr()->getReceivedWorldstate(); } void WorldstateFunctions::CopyReceivedWorldstateToStore() noexcept