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

[Client] Send ActorAI packets when followed by an NPC

Browse source 
The packet is sent regardless of whether we are the cell authority or not, so the server can decide what it wants to do with it.
This commit is contained in:
David Cernat 2018-07-12 23:08:17 +03:00
parent 6316f1e590
commit f0d4f1bbe5
1 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
apps/openmw/mwscript/aiextensions.cpp
View file

@ -3,6 +3,20 @@
#include <stdexcept>
#include <iostream>
/*
Start of tes3mp addition
Include additional headers for multiplayer purposes
*/
#include <components/openmw-mp/Log.hpp>
#include "../mwmp/Main.hpp"
#include "../mwmp/Networking.hpp"
#include "../mwmp/ActorList.hpp"
#include "../mwmp/MechanicsHelper.hpp"
/*
End of tes3mp addition
*/
#include <components/compiler/extensions.hpp>
#include <components/compiler/opcodes.hpp>
@ -318,6 +332,47 @@ namespace MWScript
std::cout << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration
<< std::endl;
/*
Start of tes3mp addition
Send ActorAI packets when an actor follows us, regardless of whether we're the cell
authority or not; the server can decide if it wants to comply with them by forwarding
them to the cell authority
*/
MWWorld::Ptr targetPtr = MWBase::Environment::get().getWorld()->searchPtr(actorID, true);
if (targetPtr)
{
mwmp::BaseActor baseActor;
baseActor.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
baseActor.mpNum = ptr.getCellRef().getMpNum();
baseActor.aiAction = mwmp::BaseActorList::FOLLOW;
baseActor.aiTarget = MechanicsHelper::getTarget(targetPtr);
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_ACTOR_AI about %s %i-%i to server",
ptr.getCellRef().getRefId(), baseActor.refNumIndex, baseActor.mpNum);
if (baseActor.aiTarget.isPlayer)
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "- Following player %s",
targetPtr.getClass().getName(targetPtr).c_str());
}
else
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "- Following actor %s %i-%i",
targetPtr.getCellRef().getRefId(), baseActor.aiTarget.refNumIndex, baseActor.aiTarget.mpNum);
}
mwmp::ActorList *actorList = mwmp::Main::get().getNetworking()->getActorList();
actorList->reset();
actorList->cell = *ptr.getCell()->getCell();
actorList->addAiActor(baseActor);
actorList->sendAiActors();
}
/*
End of tes3mp addition
*/
}
};