forked from mirror/openmw-tes3mp
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.
91 lines
2.4 KiB
C++
91 lines
2.4 KiB
C++
#include "Dialogue.hpp"
|
|
|
|
#include <components/openmw-mp/NetworkMessages.hpp>
|
|
|
|
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
|
|
#include <apps/openmw-mp/Networking.hpp>
|
|
|
|
using namespace mwmp;
|
|
|
|
void DialogueFunctions::InitializeTopicChanges(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
player->topicChanges.topics.clear();
|
|
}
|
|
|
|
unsigned int DialogueFunctions::GetTopicChangesSize(unsigned short pid) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, 0);
|
|
|
|
return player->topicChanges.count;
|
|
}
|
|
|
|
void DialogueFunctions::AddTopic(unsigned short pid, const char* topicId) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
mwmp::Topic topic;
|
|
topic.topicId = topicId;
|
|
|
|
player->topicChanges.topics.push_back(topic);
|
|
}
|
|
|
|
const char *DialogueFunctions::GetTopicId(unsigned short pid, unsigned int i) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, "");
|
|
|
|
if (i >= player->topicChanges.count)
|
|
return "invalid";
|
|
|
|
return player->topicChanges.topics.at(i).topicId.c_str();
|
|
}
|
|
|
|
void DialogueFunctions::SendTopicChanges(unsigned short pid, bool sendToOtherPlayers, bool sendToAttachedPlayer) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
mwmp::PlayerPacket *packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_TOPIC);
|
|
packet->setPlayer(player);
|
|
|
|
if (sendToAttachedPlayer)
|
|
packet->Send(false);
|
|
if (sendToOtherPlayers)
|
|
packet->Send(true);
|
|
}
|
|
|
|
void DialogueFunctions::PlayAnimation(unsigned short pid, const char* groupname, int mode, int count, bool persist) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
player->animation.groupname = groupname;
|
|
player->animation.mode = mode;
|
|
player->animation.count = count;
|
|
player->animation.persist = persist;
|
|
|
|
mwmp::PlayerPacket *packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_ANIM_PLAY);
|
|
packet->setPlayer(player);
|
|
|
|
packet->Send(false);
|
|
player->sendToLoaded(packet);
|
|
}
|
|
|
|
void DialogueFunctions::PlaySpeech(unsigned short pid, const char* sound) noexcept
|
|
{
|
|
Player *player;
|
|
GET_PLAYER(pid, player, );
|
|
|
|
player->sound = sound;
|
|
|
|
mwmp::PlayerPacket *packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_SPEECH);
|
|
packet->setPlayer(player);
|
|
|
|
packet->Send(false);
|
|
player->sendToLoaded(packet);
|
|
}
|