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

[General] Implement ActorAI packet, part 2

Browse source 
The server can now make actors start combat with players or other actors.
This commit is contained in:
David Cernat 2018-07-10 02:47:52 +03:00
parent 5628f3b977
commit 5baef09f79
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -6,6 +6,7 @@
#include "../mwdialogue/dialoguemanagerimp.hpp" #include "../mwdialogue/dialoguemanagerimp.hpp"
#include "../mwmechanics/aicombat.hpp"
#include "../mwmechanics/aifollow.hpp" #include "../mwmechanics/aifollow.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/mechanicsmanagerimp.hpp" #include "../mwmechanics/mechanicsmanagerimp.hpp"
@ -240,14 +241,17 @@ void DedicatedActor::setAI()
if (targetPtr) if (targetPtr)
{ {
if (aiAction == mwmp::BaseActorList::FOLLOW) if (aiAction == mwmp::BaseActorList::FOLLOW)
{ {
MWMechanics::AiFollow package(targetPtr); MWMechanics::AiFollow package(targetPtr);
package.allowAnyDistance(true); package.allowAnyDistance(true);
ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(package, ptr, true); ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(package, ptr, true);
} }
else if (aiAction == mwmp::BaseActorList::COMBAT)
{
MWMechanics::AiCombat package(targetPtr);
ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(package, ptr, true);
}
} }
} }
} }

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

@ -70,7 +70,8 @@ namespace mwmp
enum AI_ACTION enum AI_ACTION
{ {
FOLLOW = 0 FOLLOW = 0,
COMBAT = 1
}; };
RakNet::RakNetGUID guid; RakNet::RakNetGUID guid;