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

[Server] Use clearer names for functions used to get last received data

Browse source 
Additionally, rename GetObjectChangesSize() into the less confusing GetObjectListSize()
This commit is contained in:
David Cernat 2018-07-13 02:33:50 +03:00
parent aeb2e57444
commit 04dd59e638
6 changed files with 84 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ const BaseActor emptyActor = {};
static std::string tempCellDescription; static std::string tempCellDescription;
void ActorFunctions::ReadLastActorList() noexcept void ActorFunctions::ReadReceivedActorList() noexcept
{ {
readActorList = mwmp::Networking::getPtr()->getLastActorList(); readActorList = mwmp::Networking::getPtr()->getLastActorList();
} }
@ -46,7 +46,7 @@ void ActorFunctions::SetActorListPid(unsigned short pid) noexcept
writeActorList.guid = player->guid; writeActorList.guid = player->guid;
} }
void ActorFunctions::CopyLastActorListToStore() noexcept void ActorFunctions::CopyReceivedActorListToStore() noexcept
{ {
writeActorList = *readActorList; writeActorList = *readActorList;
} }
@ -497,10 +497,21 @@ void ActorFunctions::SendActorCellChange(bool sendToOtherVisitors, bool skipAtta
} }
} }
// All methods below are deprecated versions of methods from above // All methods below are deprecated versions of methods from above
void ActorFunctions::ReadLastActorList() noexcept
{
ReadReceivedActorList();
}
void ActorFunctions::InitializeActorList(unsigned short pid) noexcept void ActorFunctions::InitializeActorList(unsigned short pid) noexcept
{ {
ClearActorList(); ClearActorList();
SetActorListPid(pid); SetActorListPid(pid);
} }
void ActorFunctions::CopyLastActorListToStore() noexcept
{
CopyLastActorListToStore();
}

14
apps/openmw-mp/Script/Functions/Actors.hpp
View file

@ -2,13 +2,13 @@
#define OPENMW_ACTORAPI_HPP #define OPENMW_ACTORAPI_HPP
#define ACTORAPI \ #define ACTORAPI \
{"ReadLastActorList", ActorFunctions::ReadLastActorList},\ {"ReadReceivedActorList", ActorFunctions::ReadReceivedActorList},\
{"ReadCellActorList", ActorFunctions::ReadCellActorList},\ {"ReadCellActorList", ActorFunctions::ReadCellActorList},\
\ \
{"ClearActorList", ActorFunctions::ClearActorList},\ {"ClearActorList", ActorFunctions::ClearActorList},\
{"SetActorListPid", ActorFunctions::SetActorListPid},\ {"SetActorListPid", ActorFunctions::SetActorListPid},\
\ \
{"CopyLastActorListToStore", ActorFunctions::CopyLastActorListToStore},\ {"CopyReceivedActorListToStore", ActorFunctions::CopyReceivedActorListToStore},\
\ \
{"GetActorListSize", ActorFunctions::GetActorListSize},\ {"GetActorListSize", ActorFunctions::GetActorListSize},\
{"GetActorListAction", ActorFunctions::GetActorListAction},\ {"GetActorListAction", ActorFunctions::GetActorListAction},\
@ -92,7 +92,9 @@
{"SendActorAI", ActorFunctions::SendActorAI},\ {"SendActorAI", ActorFunctions::SendActorAI},\
{"SendActorCellChange", ActorFunctions::SendActorCellChange},\ {"SendActorCellChange", ActorFunctions::SendActorCellChange},\
\ \
{"InitializeActorList", ActorFunctions::InitializeActorList} {"ReadLastActorList", ActorFunctions::ReadLastActorList},\
{"InitializeActorList", ActorFunctions::InitializeActorList},\
{"CopyLastActorListToStore", ActorFunctions::CopyLastActorListToStore}
class ActorFunctions class ActorFunctions
{ {
@ -103,7 +105,7 @@ public:
* *
* \return void * \return void
*/ */
static void ReadLastActorList() noexcept; static void ReadReceivedActorList() noexcept;
/** /**
* \brief Use the temporary actor list stored for a cell as the one being read. * \brief Use the temporary actor list stored for a cell as the one being read.
@ -138,7 +140,7 @@ public:
* *
* \return void * \return void
*/ */
static void CopyLastActorListToStore() noexcept; static void CopyReceivedActorListToStore() noexcept;
/** /**
* \brief Get the number of indexes in the read actor list. * \brief Get the number of indexes in the read actor list.
@ -741,7 +743,9 @@ public:
// All methods below are deprecated versions of methods from above // All methods below are deprecated versions of methods from above
static void ReadLastActorList() noexcept;
static void InitializeActorList(unsigned short pid) noexcept; static void InitializeActorList(unsigned short pid) noexcept;
static void CopyLastActorListToStore() noexcept;
}; };

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

@ -19,7 +19,7 @@ const BaseObject emptyObject = {};
ContainerItem tempContainerItem; ContainerItem tempContainerItem;
const ContainerItem emptyContainerItem = {}; const ContainerItem emptyContainerItem = {};
void ObjectFunctions::ReadLastObjectList() noexcept void ObjectFunctions::ReadReceivedObjectList() noexcept
{ {
readObjectList = mwmp::Networking::getPtr()->getLastObjectList(); readObjectList = mwmp::Networking::getPtr()->getLastObjectList();
} }
@ -38,12 +38,12 @@ void ObjectFunctions::SetObjectListPid(unsigned short pid) noexcept
writeObjectList.guid = player->guid; writeObjectList.guid = player->guid;
} }
void ObjectFunctions::CopyLastObjectListToStore() noexcept void ObjectFunctions::CopyReceivedObjectListToStore() noexcept
{ {
writeObjectList = *readObjectList; writeObjectList = *readObjectList;
} }
unsigned int ObjectFunctions::GetObjectChangesSize() noexcept unsigned int ObjectFunctions::GetObjectListSize() noexcept
{ {
return readObjectList->baseObjectCount; return readObjectList->baseObjectCount;
} }
@ -531,11 +531,17 @@ void ObjectFunctions::SendConsoleCommand(bool sendToOtherPlayers, bool skipAttac
packet->Send(true); packet->Send(true);
} }
// All methods below are deprecated versions of methods from above // All methods below are deprecated versions of methods from above
void ObjectFunctions::ReadLastObjectList() noexcept
{
ReadReceivedObjectList();
}
void ObjectFunctions::ReadLastEvent() noexcept void ObjectFunctions::ReadLastEvent() noexcept
{ {
ReadLastObjectList(); ReadReceivedObjectList();
} }
void ObjectFunctions::InitializeObjectList(unsigned short pid) noexcept void ObjectFunctions::InitializeObjectList(unsigned short pid) noexcept
@ -549,6 +555,16 @@ void ObjectFunctions::InitializeEvent(unsigned short pid) noexcept
InitializeObjectList(pid); InitializeObjectList(pid);
} }
void ObjectFunctions::CopyLastObjectListToStore() noexcept
{
CopyReceivedObjectListToStore();
}
unsigned int ObjectFunctions::GetObjectChangesSize() noexcept
{
return GetObjectListSize();
}
unsigned char ObjectFunctions::GetEventAction() noexcept unsigned char ObjectFunctions::GetEventAction() noexcept
{ {
return GetObjectListAction(); return GetObjectListAction();

20
apps/openmw-mp/Script/Functions/Objects.hpp
View file

@ -2,14 +2,14 @@
#define OPENMW_OBJECTAPI_HPP #define OPENMW_OBJECTAPI_HPP
#define OBJECTAPI \ #define OBJECTAPI \
{"ReadLastObjectList", ObjectFunctions::ReadLastObjectList},\ {"ReadReceivedObjectList", ObjectFunctions::ReadReceivedObjectList},\
\ \
{"ClearObjectList", ObjectFunctions::ClearObjectList},\ {"ClearObjectList", ObjectFunctions::ClearObjectList},\
{"SetObjectListPid", ObjectFunctions::SetObjectListPid},\ {"SetObjectListPid", ObjectFunctions::SetObjectListPid},\
\ \
{"CopyLastObjectListToStore", ObjectFunctions::CopyLastObjectListToStore},\ {"CopyReceivedObjectListToStore", ObjectFunctions::CopyReceivedObjectListToStore},\
\ \
{"GetObjectChangesSize", ObjectFunctions::GetObjectChangesSize},\ {"GetObjectListSize", ObjectFunctions::GetObjectListSize},\
{"GetObjectListAction", ObjectFunctions::GetObjectListAction},\ {"GetObjectListAction", ObjectFunctions::GetObjectListAction},\
{"GetObjectListContainerSubAction", ObjectFunctions::GetObjectListContainerSubAction},\ {"GetObjectListContainerSubAction", ObjectFunctions::GetObjectListContainerSubAction},\
\ \
@ -102,9 +102,12 @@
{"SendVideoPlay", ObjectFunctions::SendVideoPlay},\ {"SendVideoPlay", ObjectFunctions::SendVideoPlay},\
{"SendConsoleCommand", ObjectFunctions::SendConsoleCommand},\ {"SendConsoleCommand", ObjectFunctions::SendConsoleCommand},\
\ \
{"ReadLastObjectList", ObjectFunctions::ReadLastObjectList},\
{"ReadLastEvent", ObjectFunctions::ReadLastEvent},\ {"ReadLastEvent", ObjectFunctions::ReadLastEvent},\
{"InitializeObjectList", ObjectFunctions::InitializeObjectList},\ {"InitializeObjectList", ObjectFunctions::InitializeObjectList},\
{"InitializeEvent", ObjectFunctions::InitializeEvent},\ {"InitializeEvent", ObjectFunctions::InitializeEvent},\
{"CopyLastObjectListToStore", ObjectFunctions::CopyLastObjectListToStore},\
{"GetObjectChangesSize", ObjectFunctions::GetObjectChangesSize},\
{"GetEventAction", ObjectFunctions::GetEventAction},\ {"GetEventAction", ObjectFunctions::GetEventAction},\
{"GetEventContainerSubAction", ObjectFunctions::GetEventContainerSubAction},\ {"GetEventContainerSubAction", ObjectFunctions::GetEventContainerSubAction},\
{"SetEventCell", ObjectFunctions::SetEventCell},\ {"SetEventCell", ObjectFunctions::SetEventCell},\
@ -121,7 +124,7 @@ public:
* *
* \return void * \return void
*/ */
static void ReadLastObjectList() noexcept; static void ReadReceivedObjectList() noexcept;
/** /**
* \brief Clear the data from the last object list sent by the server. * \brief Clear the data from the last object list sent by the server.
@ -145,14 +148,14 @@ public:
* *
* \return void * \return void
*/ */
static void CopyLastObjectListToStore() noexcept; static void CopyReceivedObjectListToStore() noexcept;
/** /**
* \brief Get the number of indexes in the read object list's object changes. * \brief Get the number of indexes in the read object list.
* *
* \return The number of indexes. * \return The number of indexes.
*/ */
static unsigned int GetObjectChangesSize() noexcept; static unsigned int GetObjectListSize() noexcept;
/** /**
* \brief Get the action type used in the read object list. * \brief Get the action type used in the read object list.
@ -909,9 +912,12 @@ public:
// All methods below are deprecated versions of methods from above // All methods below are deprecated versions of methods from above
static void ReadLastObjectList() noexcept;
static void ReadLastEvent() noexcept; static void ReadLastEvent() noexcept;
static void InitializeObjectList(unsigned short pid) noexcept; static void InitializeObjectList(unsigned short pid) noexcept;
static void InitializeEvent(unsigned short pid) noexcept; static void InitializeEvent(unsigned short pid) noexcept;
static void CopyLastObjectListToStore() noexcept;
static unsigned int GetObjectChangesSize() noexcept;
static unsigned char GetEventAction() noexcept; static unsigned char GetEventAction() noexcept;
static unsigned char GetEventContainerSubAction() noexcept; static unsigned char GetEventContainerSubAction() noexcept;
static void SetEventCell(const char* cellDescription) noexcept; static void SetEventCell(const char* cellDescription) noexcept;

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

@ -14,12 +14,12 @@ using namespace mwmp;
BaseWorldstate writeWorldstate; BaseWorldstate writeWorldstate;
BaseWorldstate *readWorldstate; BaseWorldstate *readWorldstate;
void WorldstateFunctions::ReadLastWorldstate() noexcept void WorldstateFunctions::ReadReceivedWorldstate() noexcept
{ {
readWorldstate = mwmp::Networking::getPtr()->getLastWorldstate(); readWorldstate = mwmp::Networking::getPtr()->getLastWorldstate();
} }
void WorldstateFunctions::CopyLastWorldstateToStore() noexcept void WorldstateFunctions::CopyReceivedWorldstateToStore() noexcept
{ {
writeWorldstate = *readWorldstate; writeWorldstate = *readWorldstate;
} }
@ -184,3 +184,16 @@ void WorldstateFunctions::SendWorldCollisionOverride(unsigned short pid, bool se
if (sendToOtherPlayers) if (sendToOtherPlayers)
packet->Send(true); packet->Send(true);
} }
// All methods below are deprecated versions of methods from above
void WorldstateFunctions::ReadLastWorldstate() noexcept
{
ReadReceivedWorldstate();
}
void WorldstateFunctions::CopyLastWorldstateToStore() noexcept
{
CopyReceivedWorldstateToStore();
}

19
apps/openmw-mp/Script/Functions/Worldstate.hpp
View file

@ -4,9 +4,9 @@
#include "../Types.hpp" #include "../Types.hpp"
#define WORLDSTATEAPI \ #define WORLDSTATEAPI \
{"ReadLastWorldstate", WorldstateFunctions::ReadLastWorldstate},\ {"ReadReceivedWorldstate", WorldstateFunctions::ReadReceivedWorldstate},\
\ \
{"CopyLastWorldstateToStore", WorldstateFunctions::CopyLastWorldstateToStore},\ {"CopyReceivedWorldstateToStore", WorldstateFunctions::CopyReceivedWorldstateToStore},\
\ \
{"ClearMapChanges", WorldstateFunctions::ClearMapChanges},\ {"ClearMapChanges", WorldstateFunctions::ClearMapChanges},\
\ \
@ -35,7 +35,10 @@
\ \
{"SendWorldMap", WorldstateFunctions::SendWorldMap},\ {"SendWorldMap", WorldstateFunctions::SendWorldMap},\
{"SendWorldTime", WorldstateFunctions::SendWorldTime},\ {"SendWorldTime", WorldstateFunctions::SendWorldTime},\
{"SendWorldCollisionOverride", WorldstateFunctions::SendWorldCollisionOverride} {"SendWorldCollisionOverride", WorldstateFunctions::SendWorldCollisionOverride},\
\
{"ReadLastWorldstate", WorldstateFunctions::ReadLastWorldstate},\
{"CopyLastWorldstateToStore", WorldstateFunctions::CopyLastWorldstateToStore}
class WorldstateFunctions class WorldstateFunctions
{ {
@ -46,7 +49,7 @@ public:
* *
* \return void * \return void
*/ */
static void ReadLastWorldstate() noexcept; static void ReadReceivedWorldstate() noexcept;
/** /**
* \brief Take the contents of the read-only worldstate last received by the * \brief Take the contents of the read-only worldstate last received by the
@ -55,7 +58,7 @@ public:
* *
* \return void * \return void
*/ */
static void CopyLastWorldstateToStore() noexcept; static void CopyReceivedWorldstateToStore() noexcept;
/** /**
* \brief Clear the map changes for the write-only worldstate. * \brief Clear the map changes for the write-only worldstate.
@ -251,6 +254,12 @@ public:
*/ */
static void SendWorldCollisionOverride(unsigned short pid, bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept; static void SendWorldCollisionOverride(unsigned short pid, bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept;
// All methods below are deprecated versions of methods from above
static void ReadLastWorldstate() noexcept;
static void CopyLastWorldstateToStore() noexcept;
}; };
#endif //OPENMW_WORLDSTATEAPI_HPP #endif //OPENMW_WORLDSTATEAPI_HPP