mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 04:49:54 +00:00
6a3fbf4e98
Previously, there was a confusing separation between script functions that had a "broadcast" argument and script functions that had a "toOthers" argument. Those with broadcast sent the packet to all players on the server when broadcast was true. Those with toOthers sent the packet to all players other than the packet's attached player. The former was based on the pattern of the original SendMessage() script function. The latter more closely resembled RakNet's own broadcast argument as seen here: https://github.com/TES3MP/CrabNet/blob/master/include/raknet/RakPeer.h#L219 This commit makes it so all sending functions have a sendToOtherPlayers argument that is false by default and a sendToAttachedPlayer that is true by default. This should simultaneously allow sending to be more intuitive, while not breaking previous existing scripts to a significant degree. Additionally, this commit also reduces some code repetition for all instances of packet-fetching in script functions.
127 lines
3.3 KiB
C++
127 lines
3.3 KiB
C++
#include "Cells.hpp"
|
|
|
|
#include <components/openmw-mp/Log.hpp>
|
|
#include <components/openmw-mp/NetworkMessages.hpp>
|
|
|
|
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
|
|
#include <apps/openmw-mp/Player.hpp>
|
|
#include <apps/openmw-mp/Networking.hpp>
|
|
|
|
#include <iostream>
|
|
using namespace std;
|
|
|
|
static std::string tempCellDescription;
|
|
|
|
unsigned int CellFunctions::GetCellStateChangesSize(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
|
|
return player->cellStateChanges.count;
|
|
}
|
|
|
|
unsigned int CellFunctions::GetCellStateType(unsigned short pid, unsigned int i) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
|
|
return player->cellStateChanges.cellStates.at(i).type;
|
|
}
|
|
|
|
const char *CellFunctions::GetCellStateDescription(unsigned short pid, unsigned int i) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, "");
|
|
|
|
if (i >= player->cellStateChanges.count)
|
|
return "invalid";
|
|
|
|
tempCellDescription = player->cellStateChanges.cellStates.at(i).cell.getDescription();
|
|
return tempCellDescription.c_str();
|
|
}
|
|
|
|
const char *CellFunctions::GetCell(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
|
|
tempCellDescription = player->cell.getDescription().c_str();
|
|
return tempCellDescription.c_str();
|
|
}
|
|
|
|
int CellFunctions::GetExteriorX(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
return player->cell.mData.mX;
|
|
}
|
|
|
|
int CellFunctions::GetExteriorY(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
return player->cell.mData.mY;
|
|
}
|
|
|
|
bool CellFunctions::IsInExterior(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, false);
|
|
|
|
return player->cell.isExterior();
|
|
}
|
|
|
|
const char *CellFunctions::GetRegion(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
|
|
return player->cell.mRegion.c_str();
|
|
}
|
|
|
|
bool CellFunctions::IsChangingRegion(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, false);
|
|
|
|
return player->isChangingRegion;
|
|
}
|
|
|
|
void CellFunctions::SetCell(unsigned short pid, const char *cellDescription) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player,);
|
|
|
|
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Script is moving %s from %s to %s", player->npc.mName.c_str(),
|
|
player->cell.getDescription().c_str(), cellDescription);
|
|
|
|
player->cell = Utils::getCellFromDescription(cellDescription);
|
|
}
|
|
|
|
void CellFunctions::SetExteriorCell(unsigned short pid, int x, int y) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player,);
|
|
|
|
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Script is moving %s from %s to %i,%i", player->npc.mName.c_str(),
|
|
player->cell.getDescription().c_str(), x, y);
|
|
|
|
// If the player is currently in an interior, turn off the interior flag
|
|
// from the cell
|
|
if (!player->cell.isExterior())
|
|
player->cell.mData.mFlags &= ~ESM::Cell::Interior;
|
|
|
|
player->cell.mData.mX = x;
|
|
player->cell.mData.mY = y;
|
|
}
|
|
|
|
void CellFunctions::SendCell(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
mwmp::PlayerPacket *packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_CELL_CHANGE);
|
|
packet->setPlayer(player);
|
|
|
|
packet->Send(false);
|
|
}
|