kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crouch on slopes/stairs, fixed crouch anim

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1484 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-25 15:01:29 +00:00
parent 67c1e60a91
commit b0ed15f1cd
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+5 -5
View File
@@ -146,9 +146,10 @@ static inline bool intersect(const vec &o, const vec &rad, const vec &from, cons
bool intersect(dynent *d, const vec &from, const vec &to, vec *end)
{
const float eyeheight = d->dyneyeheight();
vec o(d->o);
o.z += (d->aboveeye - d->dyneyeheight())/2;
return intersect(o, vec(d->radius, d->radius, (d->aboveeye + d->dyneyeheight())/2), from, to, end);
o.z += (d->aboveeye - eyeheight)/2;
return intersect(o, vec(d->radius, d->radius, (d->aboveeye + eyeheight)/2), from, to, end);
}
bool intersect(entity *e, const vec &from, const vec &to, vec *end)
@@ -540,8 +541,7 @@ void weapon::sendshoot(vec &from, vec &to)
bool weapon::modelattacking()
{
// FIXME!!!
int animtime = info.attackdelay; //min(owner->gunwait[owner->weaponsel->type], owner->weaponsel->info.attackdelay);
int animtime = min(owner->gunwait[owner->weaponsel->type], owner->weaponsel->info.attackdelay);
if(lastmillis - owner->lastaction < animtime) return true;
else return false;
}
@@ -648,7 +648,7 @@ struct grenadeent : bounceent
void explode()
{
static vec n(0,0,0);
static vec n(0,0,0);
if(bouncestate != NADE_THROWED) owner->weapons[GUN_GRENADE]->attack(n);
playsound(S_FEXPLODE, NULL, NULL, &o);
newprojectile(o, o, 1, owner==player1, owner, GUN_GRENADE, millis);