wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Walk when executing follow action and close to target

Browse source
This commit is contained in:
Vsevolod Kremianskii 2020-11-16 19:50:09 +07:00
parent a092be4276
commit bcdd99f7fc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/actionexecutor.cpp
View file

@ -40,7 +40,8 @@ namespace reone {
namespace game {
static const float kKeepPathDuration = 1000.0f;
static const float kMaxConversationDistance = 3.0f;
static const float kMaxConversationDistance = 4.0f;
static const float kDistanceWalk = 4.0f;
ActionExecutor::ActionExecutor(Game *game) : _game(game) {
if (!game) {
@ -114,9 +115,10 @@ void ActionExecutor::executeMoveToObject(Creature &actor, MoveToObjectAction &ac
void ActionExecutor::executeFollow(Creature &actor, FollowAction &action, float dt) {
SpatialObject &object = *static_cast<SpatialObject *>(action.object());
glm::vec3 dest(object.position());
float distance = action.distance();
float distance = actor.distanceTo(glm::vec2(dest));
bool run = distance > kDistanceWalk;
navigateCreature(actor, dest, true, distance, dt);
navigateCreature(actor, dest, run, action.distance(), dt);
}
void ActionExecutor::executeDoCommand(Object &actor, CommandAction &action, float dt) {