no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1106 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2007-06-03 19:00:34 +00:00
parent 6708989a51
commit 1299989969
2 changed files with 4 additions and 7 deletions
@@ -172,7 +172,7 @@ bool collide(physent *d, bool spawn, float drop, float rise)
        if(!plcollide(d, o, headspace, hi, lo)) return false;
    }
    
-    if(d!=player1) if(!plcollide(d, player1, 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;
    headspace -= 0.01f;
    
    mmcollide(d, hi, lo);    // collide with map models