teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Add packet data for attacks on and by Actors

Browse source
This commit is contained in:
David Cernat 2017-04-18 10:03:58 +03:00
parent 1db30a65cb
commit cc2250815d
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/openmw-mp/Base/BaseActor.hpp
View file

@ -38,6 +38,7 @@ namespace mwmp
std::string sound; std::string sound;
Animation animation; Animation animation;
Attack attack;
}; };
class BaseActorList class BaseActorList

14
components/openmw-mp/Packets/Actor/PacketActorAttack.cpp
View file

@ -38,7 +38,19 @@ void PacketActorAttack::Packet(RakNet::BitStream *bs, bool send)
RW(actor.refNumIndex, send); RW(actor.refNumIndex, send);
RW(actor.mpNum, send); RW(actor.mpNum, send);
// TODO: Fill this in RW(actor.attack.target.refId, send);
RW(actor.attack.target.refNumIndex, send);
RW(actor.attack.target.mpNum, send);
RW(actor.attack.target.guid, send);
RW(actor.attack.spellId, send);
RW(actor.attack.type, send);
RW(actor.attack.success, send);
RW(actor.attack.damage, send);
RW(actor.attack.pressed, send);
RW(actor.attack.knockdown, send);
RW(actor.attack.block, send);
if (!send) if (!send)
{ {

5
components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
View file

@ -16,13 +16,16 @@ void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
{ {
PlayerPacket::Packet(bs, send); PlayerPacket::Packet(bs, send);
RW(player->attack.target.refId, send);
RW(player->attack.target.refNumIndex, send);
RW(player->attack.target.mpNum, send);
RW(player->attack.target.guid, send); RW(player->attack.target.guid, send);
RW(player->attack.spellId, send); RW(player->attack.spellId, send);
RW(player->attack.type, send); RW(player->attack.type, send);
RW(player->attack.success, send); RW(player->attack.success, send);
RW(player->attack.damage, send); RW(player->attack.damage, send);
//
RW(player->attack.pressed, send); RW(player->attack.pressed, send);
RW(player->attack.knockdown, send); RW(player->attack.knockdown, send);
RW(player->attack.block, send); RW(player->attack.block, send);