X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sprite.h;h=04450775307d011776401d696c3da97c828be1ce;hp=75d7730b1f67cb2f8848f10e93746c4414f50fae;hb=HEAD;hpb=45925ff114a17b9c1c0a720ff668e2cb795cd761

diff --git a/sprite.h b/sprite.h
index 75d7730..d67b655 100644
--- a/sprite.h
+++ b/sprite.h
@@ -26,13 +26,14 @@ struct sprite {
 	uint32_t area;
 };
 
+// flags
 #define MOVE 1
 #define DRAW 2
 #define COLLIDE 4
 
 #define COLLIDES(sprite) ((sprite)->flags & COLLIDE)
 
-Sprite *free_sprites[N_TYPES];  // lists of free sprites, by type.
+extern Sprite *free_sprites[N_TYPES];  // lists of free sprites, by type.
 
 void do_collision(Sprite *a, Sprite *b);
 void collisions(void);
@@ -43,10 +44,10 @@ void add_sprite(Sprite *s);
 void move_sprite(Sprite *s);
 void move_sprites(void);
 
-Sprite *collides(Sprite *s);
-int pixel_collides(float x, float y);
+Sprite * pixel_collides(float x, float y);
 void load_sprite(Sprite *sprite, char *filename);
 
+float sprite_mass(Sprite *s);
 void bounce(Sprite *a, Sprite *b);
 
 
@@ -83,6 +84,7 @@ struct rock {
 	uint32_t area;
 	// ROCK extras
 	int type;
+	int life;
 };