mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 18:09:39 +00:00
Code Issues Releases Wiki Activity

[Server] Add server functions for handling client script local variables

Browse source 
Remove outdated server functions for client scripts.
This commit is contained in:
David Cernat 2020-06-06 14:15:01 +02:00
parent 5e6218ad6d
commit 922f54e208
2 changed files with 129 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,14 +344,29 @@ const char *ObjectFunctions::GetVideoFilename(unsigned int index) noexcept
return readObjectList->baseObjects.at(index).videoFilename.c_str();
}
const char *ObjectFunctions::GetScriptVariableName(unsigned int index) noexcept
unsigned int ObjectFunctions::GetClientLocalsSize(unsigned int objectIndex) noexcept
{
return readObjectList->baseObjects.at(index).clientVariable.id.c_str();
return readObjectList->baseObjects.at(objectIndex).clientLocals.size();
}
int ObjectFunctions::GetScriptVariableShortValue(unsigned int index) noexcept
unsigned int ObjectFunctions::GetClientLocalInternalIndex(unsigned int objectIndex, unsigned int variableIndex) noexcept
{
return readObjectList->baseObjects.at(index).clientVariable.intValue;
return readObjectList->baseObjects.at(objectIndex).clientLocals.at(variableIndex).internalIndex;
}
unsigned short ObjectFunctions::GetClientLocalVariableType(unsigned int objectIndex, unsigned int variableIndex) noexcept
{
return readObjectList->baseObjects.at(objectIndex).clientLocals.at(variableIndex).variableType;
}
int ObjectFunctions::GetClientLocalIntValue(unsigned int objectIndex, unsigned int variableIndex) noexcept
{
return readObjectList->baseObjects.at(objectIndex).clientLocals.at(variableIndex).intValue;
}
double ObjectFunctions::GetClientLocalFloatValue(unsigned int objectIndex, unsigned int variableIndex) noexcept
{
return readObjectList->baseObjects.at(objectIndex).clientLocals.at(variableIndex).floatValue;
}
unsigned int ObjectFunctions::GetContainerChangesSize(unsigned int objectIndex) noexcept
@ -599,16 +614,6 @@ void ObjectFunctions::SetObjectDoorDestinationRotation(double x, double z) noexc
tempObject.destinationPosition.rot[2] = z;
}
void ObjectFunctions::SetScriptVariableName(const char* varName) noexcept
{
tempObject.clientVariable.id = varName;
}
void ObjectFunctions::SetScriptVariableShortValue(int shortVal) noexcept
{
tempObject.clientVariable.intValue = shortVal;
}
void ObjectFunctions::SetPlayerAsObject(unsigned short pid) noexcept
{
Player *player;
@ -655,6 +660,26 @@ void ObjectFunctions::AddObject() noexcept
tempObject = emptyObject;
}
void ObjectFunctions::AddClientLocalInteger(int internalIndex, int intValue, unsigned int variableType) noexcept
{
ClientVariable clientLocal;
clientLocal.internalIndex = internalIndex;
clientLocal.intValue = intValue;
clientLocal.variableType = variableType;
tempObject.clientLocals.push_back(clientLocal);
}
void ObjectFunctions::AddClientLocalFloat(int internalIndex, double floatValue) noexcept
{
ClientVariable clientLocal;
clientLocal.internalIndex = internalIndex;
clientLocal.floatValue = floatValue;
clientLocal.variableType = mwmp::VARIABLE_TYPE::FLOAT;
tempObject.clientLocals.push_back(clientLocal);
}
void ObjectFunctions::AddContainerItem() noexcept
{
tempObject.containerItems.push_back(tempContainerItem);
@ -827,17 +852,15 @@ void ObjectFunctions::SendVideoPlay(bool sendToOtherPlayers, bool skipAttachedPl
packet->Send(true);
}
void ObjectFunctions::SendScriptGlobalShort(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept
void ObjectFunctions::SendClientScriptLocal(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept
{
/*
mwmp::ObjectPacket *packet = mwmp::Networking::get().getObjectPacketController()->GetPacket(ID_CLIENT_SCRIPT_GLOBAL);
mwmp::ObjectPacket* packet = mwmp::Networking::get().getObjectPacketController()->GetPacket(ID_CLIENT_SCRIPT_LOCAL);
packet->setObjectList(&writeObjectList);
if (!skipAttachedPlayer)
packet->Send(false);
if (sendToOtherPlayers)
packet->Send(true);
*/
}
void ObjectFunctions::SendConsoleCommand(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept

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

@ -72,8 +72,11 @@
\
{"GetVideoFilename", ObjectFunctions::GetVideoFilename},\
\
{"GetScriptVariableName", ObjectFunctions::GetScriptVariableName},\
{"GetScriptVariableShortValue", ObjectFunctions::GetScriptVariableShortValue},\
{"GetClientLocalsSize", ObjectFunctions::GetClientLocalsSize},\
{"GetClientLocalInternalIndex", ObjectFunctions::GetClientLocalInternalIndex},\
{"GetClientLocalVariableType", ObjectFunctions::GetClientLocalVariableType},\
{"GetClientLocalIntValue", ObjectFunctions::GetClientLocalIntValue},\
{"GetClientLocalFloatValue", ObjectFunctions::GetClientLocalFloatValue},\
\
{"GetContainerChangesSize", ObjectFunctions::GetContainerChangesSize},\
{"GetContainerItemRefId", ObjectFunctions::GetContainerItemRefId},\
@ -126,9 +129,6 @@
{"SetObjectDoorDestinationPosition", ObjectFunctions::SetObjectDoorDestinationPosition},\
{"SetObjectDoorDestinationRotation", ObjectFunctions::SetObjectDoorDestinationRotation},\
\
{"SetScriptVariableName", ObjectFunctions::SetScriptVariableName},\
{"SetScriptVariableShortValue", ObjectFunctions::SetScriptVariableShortValue},\
\
{"SetPlayerAsObject", ObjectFunctions::SetPlayerAsObject},\
\
{"SetContainerItemRefId", ObjectFunctions::SetContainerItemRefId},\
@ -140,6 +140,8 @@
{"SetContainerItemActionCountByIndex", ObjectFunctions::SetContainerItemActionCountByIndex},\
\
{"AddObject", ObjectFunctions::AddObject},\
{"AddClientLocalInteger", ObjectFunctions::AddClientLocalInteger},\
{"AddClientLocalFloat", ObjectFunctions::AddClientLocalFloat},\
{"AddContainerItem", ObjectFunctions::AddContainerItem},\
\
{"SendObjectActivate", ObjectFunctions::SendObjectActivate},\
@ -157,7 +159,7 @@
{"SendDoorDestination", ObjectFunctions::SendDoorDestination},\
{"SendContainer", ObjectFunctions::SendContainer},\
{"SendVideoPlay", ObjectFunctions::SendVideoPlay},\
{"SendScriptGlobalShort", ObjectFunctions::SendScriptGlobalShort},\
{"SendClientScriptLocal", ObjectFunctions::SendClientScriptLocal},\
{"SendConsoleCommand", ObjectFunctions::SendConsoleCommand},\
\
{"ReadLastObjectList", ObjectFunctions::ReadLastObjectList},\
@ -695,14 +697,60 @@ public:
*/
static const char *GetVideoFilename(unsigned int index) noexcept;
static const char *GetScriptVariableName(unsigned int index) noexcept;
static int GetScriptVariableShortValue(unsigned int index) noexcept;
/**
* \brief Get the number of client local variables of the object at a certain index in the
* read object list.
*
* \param index The index of the object.
* \return The number of client local variables.
*/
static unsigned int GetClientLocalsSize(unsigned int objectIndex) noexcept;
/**
* \brief Get the internal script index of the client local variable at a certain variableIndex in
* the client locals of the object at a certain objectIndex in the read object list.
*
* \param objectIndex The index of the object.
* \param variableIndex The index of the client local.
* \return The internal script index.
*/
static unsigned int GetClientLocalInternalIndex(unsigned int objectIndex, unsigned int variableIndex) noexcept;
/**
* \brief Get the type of the client local variable at a certain variableIndex in the client locals
* of the object at a certain objectIndex in the read object list.
*
* \param index The index of the object.
* \param variableIndex The index of the client local.
* \return The variable type (0 for INTEGER, 1 for LONG, 2 for FLOAT).
*/
static unsigned short GetClientLocalVariableType(unsigned int objectIndex, unsigned int variableIndex) noexcept;
/**
* \brief Get the integer value of the client local variable at a certain variableIndex in the client
* locals of the object at a certain objectIndex in the read object list.
*
* \param index The index of the object.
* \param variableIndex The index of the client local.
* \return The integer value.
*/
static int GetClientLocalIntValue(unsigned int objectIndex, unsigned int variableIndex) noexcept;
/**
* \brief Get the float value of the client local variable at a certain variableIndex in the client
* locals of the object at a certain objectIndex in the read object list.
*
* \param index The index of the object.
* \param variableIndex The index of the client local.
* \return The float value.
*/
static double GetClientLocalFloatValue(unsigned int objectIndex, unsigned int variableIndex) noexcept;
/**
* \brief Get the number of container item indexes of the object at a certain index in the
* read object list.
*
* \param index The index of the object.
* \param objectIndex The index of the object.
* \return The number of container item indexes.
*/
static unsigned int GetContainerChangesSize(unsigned int objectIndex) noexcept;
@ -1116,9 +1164,6 @@ public:
*/
static void SetObjectDoorDestinationRotation(double x, double z) noexcept;
static void SetScriptVariableName(const char* varName) noexcept;
static void SetScriptVariableShortValue(int shortVal) noexcept;
/**
* \brief Set a player as the object in the temporary object stored on the server.
* Currently only used for ConsoleCommand packets.
@ -1194,6 +1239,27 @@ public:
*/
static void AddObject() noexcept;
/**
* \brief Add a client local variable with an integer value to the client locals of the server's
* temporary object.
*
* \param internalIndex The internal script index of the client local.
* \param variableType The variable type (0 for SHORT, 1 for LONG).
* \param intValue The integer value of the client local.
* \return void
*/
static void AddClientLocalInteger(int internalIndex, int intValue, unsigned int variableType) noexcept;
/**
* \brief Add a client local variable with a float value to the client locals of the server's
* temporary object.
*
* \param internalIndex The internal script index of the client local.
* \param floatValue The float value of the client local.
* \return void
*/
static void AddClientLocalFloat(int internalIndex, double floatValue) noexcept;
/**
* \brief Add a copy of the server's temporary container item to the container changes of the
* server's temporary object.
@ -1368,7 +1434,16 @@ public:
*/
static void SendVideoPlay(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept;
static void SendScriptGlobalShort(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept;
/**
* \brief Send a ClientScriptLocal packet.
*
* \param sendToOtherPlayers Whether this packet should be sent to players other than the
* player attached to the packet (false by default).
* \param skipAttachedPlayer Whether the packet should skip being sent to the player attached
* to the packet (false by default).
* \return void
*/
static void SendClientScriptLocal(bool sendToOtherPlayers, bool skipAttachedPlayer) noexcept;
/**
* \brief Send a ConsoleCommand packet.