diff options
Diffstat (limited to 'src/shared/iengine.h')
| -rw-r--r-- | src/shared/iengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/iengine.h b/src/shared/iengine.h index 9f5dbb5..8bc7521 100644 --- a/src/shared/iengine.h +++ b/src/shared/iengine.h @@ -34,7 +34,7 @@ extern void lightent(extentity &e, float height = 8.0f); extern void lightreaching(const vec &target, vec &color, vec &dir, bool fast = false, extentity *e = 0, float ambient = 0.4f); extern entity *brightestlight(const vec &target, const vec &dir); -enum { RAY_BB = 1, RAY_POLY = 3, RAY_ALPHAPOLY = 7, RAY_ENTS = 9, RAY_CLIPMAT = 16, RAY_SKIPFIRST = 32, RAY_EDITMAT = 64, RAY_SHADOW = 128, RAY_PASS = 256, RAY_SKIPSKY = 512, RAY_SKYTEX = 1024 }; +enum { RAY_BB = 1, RAY_POLY = 3, RAY_ALPHAPOLY = 7, RAY_ENTS = 9, RAY_CLIPMAT = 16, RAY_SKIPFIRST = 32, RAY_EDITMAT = 64, RAY_SHADOW = 128, RAY_PASS = 256 }; extern float raycube (const vec &o, const vec &ray, float radius = 0, int mode = RAY_CLIPMAT, int size = 0, extentity *t = 0); extern float raycubepos(const vec &o, const vec &ray, vec &hit, float radius = 0, int mode = RAY_CLIPMAT, int size = 0); @@ -367,8 +367,8 @@ extern physent *collideplayer; extern void moveplayer(physent *pl, int moveres, bool local); extern bool moveplayer(physent *pl, int moveres, bool local, int curtime); extern bool collide(physent *d, const vec &dir = vec(0, 0, 0), float cutoff = 0.0f, bool playercol = true, bool insideplayercol = false); -extern bool bounce(physent *d, float secs, float elasticity, float waterfric, float grav); -extern bool bounce(physent *d, float elasticity, float waterfric, float grav); +extern bool bounce(physent *d, float secs, float elasticity, float grav); +extern bool bounce(physent *d, float elasticity, float float grav); extern void avoidcollision(physent *d, const vec &dir, physent *obstacle, float space); extern bool overlapsdynent(const vec &o, float radius); extern bool movecamera(physent *pl, const vec &dir, float dist, float stepdist); |