Commit ce0f3dfc authored by Mario's avatar Mario

Merge branch 'maint' of https://gitlab.com/xonotic/xonotic-data.pk3dir into maint

parents e3f177ec 6cca4300
......@@ -592,7 +592,7 @@ void monster_CalculateVelocity(entity mon, vector to, vector from, float turnrat
{
float current_distance = vlen((('1 0 0' * to.x) + ('0 1 0' * to.y)) - (('1 0 0' * from.x) + ('0 1 0' * from.y))); // for the sake of this check, exclude Z axis
float initial_height = 0; //min(50, (targ_distance * tanh(20)));
float current_height = (initial_height * min(1, (current_distance / self.pass_distance)));
float current_height = (initial_height * min(1, self.pass_distance ? (current_distance / self.pass_distance) : 0));
//print("current_height = ", ftos(current_height), ", initial_height = ", ftos(initial_height), ".\n");
vector targpos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment