markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delaying jump collision action instead of randoming

Browse source
This commit is contained in:
jeefo 2015-07-22 19:14:07 +03:00
commit 5174799000
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/core.h
View file

@ -848,6 +848,7 @@ private:
float m_firstCollideTime; // time of first collision float m_firstCollideTime; // time of first collision
float m_probeTime; // time of probing different moves float m_probeTime; // time of probing different moves
float m_lastCollTime; // time until next collision check float m_lastCollTime; // time until next collision check
float m_jumpStateTimer; // timer for jumping collision check
unsigned int m_collisionProbeBits; // bits of possible collision moves unsigned int m_collisionProbeBits; // bits of possible collision moves
unsigned int m_collideMoves[MAX_COLLIDE_MOVES]; // sorted array of movements unsigned int m_collideMoves[MAX_COLLIDE_MOVES]; // sorted array of movements

5
source/navigate.cpp
View file

@ -428,7 +428,7 @@ void Bot::CheckTerrain (float movedDistance, const Vector &dirNormal)
else if (IsInWater ()) else if (IsInWater ())
bits |= (PROBE_JUMP | PROBE_STRAFE); bits |= (PROBE_JUMP | PROBE_STRAFE);
else else
bits |= (PROBE_STRAFE | (Random.Long (0, 20) > (cantMoveForward ? 10 : 5) ? PROBE_JUMP : 0)); bits |= (PROBE_STRAFE | (m_jumpStateTimer < GetWorldTime () ? PROBE_JUMP : 0));
// collision check allowed if not flying through the air // collision check allowed if not flying through the air
if (IsOnFloor () || IsOnLadder () || IsInWater ()) if (IsOnFloor () || IsOnLadder () || IsInWater ())
@ -617,7 +617,10 @@ void Bot::CheckTerrain (float movedDistance, const Vector &dirNormal)
{ {
case COLLISION_JUMP: case COLLISION_JUMP:
if (IsOnFloor () || IsInWater ()) if (IsOnFloor () || IsInWater ())
{
pev->button |= IN_JUMP; pev->button |= IN_JUMP;
m_jumpStateTimer = Random.Float (1.0f, 2.0f);
}
break; break;
case COLLISION_DUCK: case COLLISION_DUCK: