Merge remote-tracking branch 'upstream/master'

bl0ckeduser · Dec 3, 2011 · 01f9f20 · 01f9f20
2 parents 9af674f + 50e3429
commit 01f9f20
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bullet.c b/bullet.c
@@ -42,6 +42,10 @@ void bulletTick(game_obj* bul)
 	if(bul->data[BULLET_EXPLODED]==1)
 	{
 		++bul->data[BULLET_EXPLODED];
+
+		/* The bullet is not immediately deleted,
+		   but rather scheduled for deletion and
+		   deleted when gc_collect() is called. */
 		deleteNode(bul);
 	}