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

shotline sound fx, grenade explosion fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1491 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-25 23:39:22 +00:00
parent 34400bcd3a
commit 59f821265e
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ bool collide(physent *d, bool spawn, float drop, float rise)
if(!plcollide(d, o, headspace, hi, lo)) return false;
}
if(d!=player1 && !(d->type==ENT_BOUNCE && player1->inhandnade==((bounceent *)d))) if(!plcollide(d, player1, headspace, hi, lo)) return false;
if(d!=player1 && !(d->type==ENT_BOUNCE && ((bounceent *)d)->bouncestate==NADE_ACTIVATED || ((bounceent *)d)->bouncestate==NADE_THROWED)) if(!plcollide(d, player1, headspace, hi, lo)) return false;
headspace -= 0.01f;
mmcollide(d, hi, lo); // collide with map models