*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@216 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2006-03-11 20:47:11 +00:00
parent f6d7334287
commit 3928c635a7
11 changed files with 166 additions and 1525 deletions
@@ -316,10 +316,12 @@ void mphysents()
    loopv(physents) if(physents[i])
    {
        physent *p = physents[i];
-        if(p->throwed) moveplayer(p, 2, false);
-        if(lastmillis - p->millis >= p->lifetime)
+        if(p->state == NADE_THROWED) moveplayer(p, 2, false);
+//        printf("physent %i: %i %i %i\n", i, lastmillis, p->millis, p->timetolife);
+        
+        if(lastmillis - p->millis >= p->timetolife)
        {
-            explode_nade(physents[i]);
+            if(p->state==NADE_ACTIVATED || p->state==NADE_THROWED) explode_nade(physents[i]);
            physents.remove(i);
            i--;
        };