Merge pull request #46 from BjossiAlfreds/fixbot-stuck2

Small hotfix to make fixbot unstucking logic reachable
This commit is contained in:
Yamagi 2020-01-15 15:55:12 +01:00 committed by GitHub
commit 632d972c78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -397,12 +397,10 @@ use_scanner(edict_t *self)
if (VectorLength(vec) < 56) if (VectorLength(vec) < 56)
{ {
self->monsterinfo.currentmove = &fixbot_move_weld_start; self->monsterinfo.currentmove = &fixbot_move_weld_start;
}
return; return;
} }
}
if (strcmp(self->goalentity->classname, "bot_goal") == 0) else if (strcmp(self->goalentity->classname, "bot_goal") == 0)
{ {
VectorSubtract(self->s.origin, self->goalentity->s.origin, vec); VectorSubtract(self->s.origin, self->goalentity->s.origin, vec);
@ -411,11 +409,12 @@ use_scanner(edict_t *self)
self->goalentity->nextthink = level.time + 0.1; self->goalentity->nextthink = level.time + 0.1;
self->goalentity->think = G_FreeEdict; self->goalentity->think = G_FreeEdict;
self->goalentity = self->enemy = NULL; self->goalentity = self->enemy = NULL;
self->monsterinfo.currentmove = &fixbot_move_stand; self->monsterinfo.currentmove = &fixbot_move_stand;
}
return; return;
} }
}
VectorSubtract(self->s.origin, self->s.old_origin, vec); VectorSubtract(self->s.origin, self->s.old_origin, vec);