mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 20:49:41 +00:00
Code Issues Releases Wiki Activity

[Server] Rename InitiateEvent() into InitializeEvent() for consistency

Browse source
This commit is contained in:
David Cernat 2017-07-07 08:12:48 +03:00
parent 1d504a665f
commit 2c05b7f747
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ void WorldFunctions::ReadLastEvent() noexcept
readEvent = mwmp::Networking::getPtr()->getLastEvent(); readEvent = mwmp::Networking::getPtr()->getLastEvent();
} }
void WorldFunctions::InitiateEvent(unsigned short pid) noexcept void WorldFunctions::InitializeEvent(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, ); GET_PLAYER(pid, player, );

4
apps/openmw-mp/Script/Functions/World.hpp
View file

@ -3,7 +3,7 @@
#define WORLDAPI \ #define WORLDAPI \
{"ReadLastEvent", WorldFunctions::ReadLastEvent},\ {"ReadLastEvent", WorldFunctions::ReadLastEvent},\
{"InitiateEvent", WorldFunctions::InitiateEvent},\ {"InitializeEvent", WorldFunctions::InitializeEvent},\
\ \
{"GetObjectChangesSize", WorldFunctions::GetObjectChangesSize},\ {"GetObjectChangesSize", WorldFunctions::GetObjectChangesSize},\
{"GetEventAction", WorldFunctions::GetEventAction},\ {"GetEventAction", WorldFunctions::GetEventAction},\
@ -72,7 +72,7 @@ class WorldFunctions
public: public:
static void ReadLastEvent() noexcept; static void ReadLastEvent() noexcept;
static void InitiateEvent(unsigned short pid) noexcept; static void InitializeEvent(unsigned short pid) noexcept;
static unsigned int GetObjectChangesSize() noexcept; static unsigned int GetObjectChangesSize() noexcept;
static unsigned char GetEventAction() noexcept; static unsigned char GetEventAction() noexcept;

2
components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp
View file

@ -35,7 +35,7 @@ void PacketPlayerFaction::Packet(RakNet::BitStream *bs, bool send)
RW(faction.rank, send); RW(faction.rank, send);
if (player->factionChanges.action == FactionChanges::BOTH || player->factionChanges.action == FactionChanges::EXPULSION) if (player->factionChanges.action == FactionChanges::BOTH || player->factionChanges.action == FactionChanges::EXPULSION)
RW(faction.isExpelled, send); RW(faction.isExpelled, send);
if (!send) if (!send)
player->factionChanges.factions.push_back(faction); player->factionChanges.factions.push_back(faction);