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

[General] Remove creatureStats.mDead from packets

Browse source
This commit is contained in:
Koncord 2017-06-27 15:03:41 +08:00
parent c58c26f6c0
commit fcccd7b665
5 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp
View file

@ -22,6 +22,8 @@ namespace mwmp
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str()); LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
player.creatureStats.mDead = true;
packet.Send(true); packet.Send(true);
Script::Call<Script::CallbackIdentity("OnPlayerDeath")>(player.getId()); Script::Call<Script::CallbackIdentity("OnPlayerDeath")>(player.getId());

2
apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp
View file

@ -26,6 +26,8 @@ namespace mwmp
{ {
LOG_APPEND(Log::LOG_INFO, "- Packet was about me"); LOG_APPEND(Log::LOG_INFO, "- Packet was about me");
player->creatureStats.mDead = true;
MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
MWMechanics::DynamicStat<float> health = playerPtr.getClass().getCreatureStats(playerPtr).getHealth(); MWMechanics::DynamicStat<float> health = playerPtr.getClass().getCreatureStats(playerPtr).getHealth();
health.setCurrent(0); health.setCurrent(0);

2
apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp
View file

@ -27,6 +27,8 @@ namespace mwmp
if (isLocal()) if (isLocal())
{ {
LOG_APPEND(Log::LOG_INFO, "- Packet was about me with resurrectType of %i", player->resurrectType); LOG_APPEND(Log::LOG_INFO, "- Packet was about me with resurrectType of %i", player->resurrectType);
player->creatureStats.mDead = false;
MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();

1
components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp
View file

@ -21,7 +21,6 @@ namespace mwmp
void Packet(RakNet::BitStream *bs, bool send) void Packet(RakNet::BitStream *bs, bool send)
{ {
PlayerPacket::Packet(bs, send); PlayerPacket::Packet(bs, send);
RW(player->creatureStats.mDead, send);
RW(player->deathReason, send, 1); RW(player->deathReason, send, 1);
} }

1
components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp
View file

@ -13,6 +13,5 @@ void PacketPlayerResurrect::Packet(RakNet::BitStream *bs, bool send)
{ {
PlayerPacket::Packet(bs, send); PlayerPacket::Packet(bs, send);
RW(player->creatureStats.mDead, send);
RW(player->resurrectType, send); RW(player->resurrectType, send);
} }