X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sprite.h;h=f9070b43141a8479668e4ed3de792b01d220789a;hp=e1216cf03cb5d452846b8c83d4233bf4e1641bfa;hb=e06676edd300c8a85d2e6715427e7e22e55c7670;hpb=bb819ae60e78c875e66fe2de3ac7fa2b9824a1e5

diff --git a/sprite.h b/sprite.h
index e1216cf..f9070b4 100644
--- a/sprite.h
+++ b/sprite.h
@@ -8,9 +8,9 @@ typedef struct sprite Sprite;
 
 #define SPRITE(x) ((Sprite *) (x))
 
-#define BASE_SPRITE 0
-#define SHIP_SPRITE 1
-#define ROCK_SPRITE 2
+#define BASE 0
+#define SHIP 1
+#define ROCK 2
 #define N_TYPES 3
 
 struct sprite {
@@ -27,7 +27,11 @@ struct sprite {
 
 Sprite *free_sprites[N_TYPES];  // lists of free sprites, by type.
 
+void do_collision(Sprite *a, Sprite *b);
+void collisions(void);
+
 void init_sprites(void);
+void reset_sprites(void);
 void add_sprite(Sprite *s);
 void move_sprite(Sprite *s);
 void move_sprites(void);
@@ -95,7 +99,7 @@ static inline void
 draw_sprite(Sprite *s)
 {
 	SDL_Rect dest;
-	if(s->type == NONE) return;
+	if(s->type < 0) return;
 	dest.x = s->x; dest.y = s->y;
 	SDL_BlitSurface(s->image, NULL, surf_screen, &dest);
 }