mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 19:36:42 +00:00
Code Issues Releases Wiki Activity

[General] Implement OnObjectHit packet, part 2

Browse source 
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.

It is also sent when creatures hit a non-actor object.
This commit is contained in:
David Cernat 2019-12-13 14:00:51 +02:00
parent 96049befe9
commit bc093c8596
8 changed files with 85 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw-mp/Script/Functions/Objects.cpp
View file

@ -184,6 +184,11 @@ const char *ObjectFunctions::GetObjectActivatingName(unsigned int index) noexcep
return readObjectList->baseObjects.at(index).activatingActor.name.c_str();
}
bool ObjectFunctions::GetObjectHitSuccess(unsigned int index) noexcept
{
return readObjectList->baseObjects.at(index).hitAttack.success;
}
bool ObjectFunctions::DoesObjectHavePlayerHitting(unsigned int index) noexcept
{
return readObjectList->baseObjects.at(index).hittingActor.isPlayer;

10
apps/openmw-mp/Script/Functions/Objects.hpp
View file

@ -38,6 +38,7 @@
{"GetObjectActivatingMpNum", ObjectFunctions::GetObjectActivatingMpNum},\
{"GetObjectActivatingName", ObjectFunctions::GetObjectActivatingName},\
\
{"GetObjectHitSuccess", ObjectFunctions::GetObjectHitSuccess},\
{"DoesObjectHavePlayerHitting", ObjectFunctions::DoesObjectHavePlayerHitting},\
{"GetObjectHittingPid", ObjectFunctions::GetObjectHittingPid},\
{"GetObjectHittingRefId", ObjectFunctions::GetObjectHittingRefId},\
@ -417,6 +418,15 @@ public:
*/
static const char *GetObjectActivatingName(unsigned int index) noexcept;
/**
* \brief Check whether the object at a certain index in the read object list has been
* hit successfully.
*
* \param index The index of the object.
* \return The success state.
*/
static bool GetObjectHitSuccess(unsigned int index) noexcept;
/**
* \brief Check whether the object at a certain index in the read object list has been
* hit by a player.

39
apps/openmw/mwclass/creature.cpp
View file

@ -13,8 +13,10 @@
*/
#include <components/openmw-mp/TimedLog.hpp>
#include "../mwmp/Main.hpp"
#include "../mwmp/Networking.hpp"
#include "../mwmp/LocalPlayer.hpp"
#include "../mwmp/PlayerList.hpp"
#include "../mwmp/ObjectList.hpp"
#include "../mwmp/CellController.hpp"
#include "../mwmp/MechanicsHelper.hpp"
/*
@ -291,8 +293,23 @@ namespace MWClass
MWWorld::Ptr victim = result.first;
/*
Start of tes3mp change (major)
Send an ID_OBJECT_HIT packet when hitting non-actors instead of
just returning
*/
if (!victim.getClass().isActor())
return; // Can't hit non-actors
{
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectHit(victim, ptr);
objectList->sendObjectHit();
}
/*
End of tes3mp change (major)
*/
osg::Vec3f hitPosition (result.second);
@ -324,12 +341,20 @@ namespace MWClass
If this was a failed attack by the LocalPlayer or LocalActor, send a
packet about it
Send an ID_OBJECT_HIT about it as well
*/
if (localAttack)
{
localAttack->pressed = false;
localAttack->success = false;
localAttack->shouldSend = true;
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectHit(victim, ptr, *localAttack);
objectList->sendObjectHit();
}
/*
End of tes3mp addition
@ -553,8 +578,10 @@ namespace MWClass
/*
Start of tes3mp addition
If the attacker was the LocalPlayer or LocalActor, record their target and send a
packet with it
If the attacker was the LocalPlayer or LocalActor, record their target and send an
attack packet about it
Send an ID_OBJECT_HIT about it as well
If the victim was a LocalActor who died, record their attacker as the killer
*/
@ -569,6 +596,12 @@ namespace MWClass
MechanicsHelper::assignAttackTarget(localAttack, ptr);
localAttack->shouldSend = true;
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectHit(ptr, attacker, *localAttack);
objectList->sendObjectHit();
}
if (mwmp::Main::get().getCellController()->isLocalActor(ptr))

20
apps/openmw/mwclass/npc.cpp
View file

@ -670,12 +670,20 @@ namespace MWClass
If this was a failed attack by the LocalPlayer or LocalActor, send a
packet about it
Send an ID_OBJECT_HIT about it as well
*/
if (localAttack)
{
localAttack->pressed = false;
localAttack->success = false;
localAttack->shouldSend = true;
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectHit(victim, ptr, *localAttack);
objectList->sendObjectHit();
}
/*
End of tes3mp addition
@ -993,8 +1001,10 @@ namespace MWClass
/*
Start of tes3mp addition
If the attacker was the LocalPlayer or LocalActor, record their target and send a
packet with it
If the attacker was the LocalPlayer or LocalActor, record their target and send an
attack packet about it
Send an ID_OBJECT_HIT about it as well
If the victim was the LocalPlayer, check whether packets should be sent about
their new dynamic stats and position
@ -1012,6 +1022,12 @@ namespace MWClass
MechanicsHelper::assignAttackTarget(localAttack, ptr);
localAttack->shouldSend = true;
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectHit(ptr, attacker, *localAttack);
objectList->sendObjectHit();
}
if (ptr == MWMechanics::getPlayer())

12
apps/openmw/mwmp/ObjectList.cpp
View file

@ -979,6 +979,18 @@ void ObjectList::addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hitti
mwmp::BaseObject baseObject = getObjectFromPtr(ptr);
baseObject.hittingActor = MechanicsHelper::getTarget(hittingActor);
baseObject.hitAttack.success = false;
addObject(baseObject);
}
void ObjectList::addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor, const Attack hitAttack)
{
cell = *ptr.getCell()->getCell();
mwmp::BaseObject baseObject = getObjectFromPtr(ptr);
baseObject.hittingActor = MechanicsHelper::getTarget(hittingActor);
baseObject.hitAttack = hitAttack;
addObject(baseObject);
}

1
apps/openmw/mwmp/ObjectList.hpp
View file

@ -54,6 +54,7 @@ namespace mwmp
void addObjectActivate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& activatingActor);
void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor);
void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor, const Attack hitAttack);
void addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer = false);
void addObjectSpawn(const MWWorld::Ptr& ptr);
void addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& master, std::string spellId, int effectId, float duration);

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

@ -64,6 +64,7 @@ namespace mwmp
Target activatingActor;
Target hittingActor;
Attack hitAttack;
bool isSummon;
int summonEffectId;

2
components/openmw-mp/Packets/Object/PacketObjectHit.cpp
View file

@ -42,6 +42,8 @@ void PacketObjectHit::Packet(RakNet::BitStream *newBitstream, bool send)
RW(baseObject.hittingActor.name, send);
}
RW(baseObject.hitAttack.success, send);
if (!send)
objectList->baseObjects.push_back(baseObject);
}