AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-27 06:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

[General] Make ActorAttack packet consistent with PlayerAttack

Browse Source 
Additionally, fix a typo in PlayerAttack where a boolean argument was outside of the parentheses it should have been in.
This commit is contained in:
David Cernat 2018-07-24 22:43:00 +03:00
parent b79221efcc
commit ea8a41160c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/openmw-mp/Packets/Actor/PacketActorAttack.cpp
View File

@ -24,11 +24,13 @@ void PacketActorAttack::Actor(BaseActor &actor, bool send)
RW(actor.attack.target.mpNum, send);
}
RW(actor.attack.pressed, send);
RW(actor.attack.instant, send);
RW(actor.attack.success, send);
RW(actor.attack.type, send);
if (actor.attack.type == mwmp::Attack::MELEE || actor.attack.type == mwmp::Attack::MAGIC)
{
RW(actor.attack.pressed, send);
RW(actor.attack.success, send);
if (actor.attack.type == mwmp::Attack::MELEE)
{
RW(actor.attack.damage, send);
@ -39,7 +41,11 @@ void PacketActorAttack::Actor(BaseActor &actor, bool send)
RW(actor.attack.applyProjectileEnchantment, send);
}
else if (actor.attack.type == mwmp::Attack::MAGIC)
{
RW(actor.attack.instant, send);
RW(actor.attack.spellId, send, true);
}
}
else if (actor.attack.type == mwmp::Attack::ITEM_MAGIC)
RW(actor.attack.itemId, send, true);
}

2
components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
View File

@ -48,5 +48,5 @@ void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
}
}
else if (player->attack.type == mwmp::Attack::ITEM_MAGIC)
RW(player->attack.itemId, send), true;
RW(player->attack.itemId, send, true);
}