teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Clarify functions used for getting data in Networking

Browse source
This commit is contained in:
David Cernat 2018-07-13 02:40:24 +03:00
parent 04dd59e638
commit 20296859ee
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw-mp/Networking.cpp
View file

@ -1,7 +1,3 @@
//
// Created by koncord on 12.01.16.
//
#include "Player.hpp" #include "Player.hpp"
#include "processors/ProcessorInitializer.hpp" #include "processors/ProcessorInitializer.hpp"
#include <RakPeer.h> #include <RakPeer.h>
@ -397,17 +393,17 @@ WorldstatePacketController *Networking::getWorldstatePacketController() const
return worldstatePacketController; return worldstatePacketController;
} }
BaseActorList *Networking::getLastActorList() BaseActorList *Networking::getReceivedActorList()
{ {
return &baseActorList; return &baseActorList;
} }
BaseObjectList *Networking::getLastObjectList() BaseObjectList *Networking::getReceivedObjectList()
{ {
return &baseObjectList; return &baseObjectList;
} }
BaseWorldstate *Networking::getLastWorldstate() BaseWorldstate *Networking::getReceivedWorldstate()
{ {
return &baseWorldstate; return &baseWorldstate;
} }

6
apps/openmw-mp/Networking.hpp
View file

@ -44,9 +44,9 @@ namespace mwmp
ObjectPacketController *getObjectPacketController() const; ObjectPacketController *getObjectPacketController() const;
WorldstatePacketController *getWorldstatePacketController() const; WorldstatePacketController *getWorldstatePacketController() const;
BaseActorList *getLastActorList(); BaseActorList *getReceivedActorList();
BaseObjectList *getLastObjectList(); BaseObjectList *getReceivedObjectList();
BaseWorldstate *getLastWorldstate(); BaseWorldstate *getReceivedWorldstate();
int getCurrentMpNum(); int getCurrentMpNum();
void setCurrentMpNum(int value); void setCurrentMpNum(int value);

2
apps/openmw-mp/Script/Functions/Actors.cpp
View file

@ -22,7 +22,7 @@ static std::string tempCellDescription;
void ActorFunctions::ReadReceivedActorList() noexcept void ActorFunctions::ReadReceivedActorList() noexcept
{ {
readActorList = mwmp::Networking::getPtr()->getLastActorList(); readActorList = mwmp::Networking::getPtr()->getReceivedActorList();
} }
void ActorFunctions::ReadCellActorList(const char* cellDescription) noexcept void ActorFunctions::ReadCellActorList(const char* cellDescription) noexcept

2
apps/openmw-mp/Script/Functions/Objects.cpp
View file

@ -21,7 +21,7 @@ const ContainerItem emptyContainerItem = {};
void ObjectFunctions::ReadReceivedObjectList() noexcept void ObjectFunctions::ReadReceivedObjectList() noexcept
{ {
readObjectList = mwmp::Networking::getPtr()->getLastObjectList(); readObjectList = mwmp::Networking::getPtr()->getReceivedObjectList();
} }
void ObjectFunctions::ClearObjectList() noexcept void ObjectFunctions::ClearObjectList() noexcept

2
apps/openmw-mp/Script/Functions/Worldstate.cpp
View file

@ -16,7 +16,7 @@ BaseWorldstate *readWorldstate;
void WorldstateFunctions::ReadReceivedWorldstate() noexcept void WorldstateFunctions::ReadReceivedWorldstate() noexcept
{ {
readWorldstate = mwmp::Networking::getPtr()->getLastWorldstate(); readWorldstate = mwmp::Networking::getPtr()->getReceivedWorldstate();
} }
void WorldstateFunctions::CopyReceivedWorldstateToStore() noexcept void WorldstateFunctions::CopyReceivedWorldstateToStore() noexcept