made bang dots hit rocks, removed blast_rocks function.

[vor.git] / sprite.h

diff --git a/sprite.h b/sprite.h
index 2e7ad3b..3cb2c0e 100644 (file)
--- a/sprite.h
+++ b/sprite.h
@@ -26,12 +26,11 @@ struct sprite {
        uint32_t area;
 };
 
-#define MOVE_FLAG 1
-#define DRAW_FLAG 2
-#define COLLIDE_FLAG 4
-#define ALL_FLAGS (~0)
+#define MOVE 1
+#define DRAW 2
+#define COLLIDE 4
 
-#define COLLIDES(sprite) ((sprite)->flags & COLLIDE_FLAG)
+#define COLLIDES(sprite) ((sprite)->flags & COLLIDE)
 
 Sprite *free_sprites[N_TYPES];  // lists of free sprites, by type.
 
@@ -45,9 +44,10 @@ 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);
 
 
@@ -109,7 +109,7 @@ static inline void
 draw_sprite(Sprite *s)
 {
        SDL_Rect dest;
-       if(s->flags & DRAW_FLAG) {
+       if(s->flags & DRAW) {
                dest.x = s->x; dest.y = s->y;
                SDL_BlitSurface(s->image, NULL, surf_screen, &dest);
        }