Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we now return you to your regularly scheduled exploding ship.
[vor.git]
/
sprite.h
diff --git
a/sprite.h
b/sprite.h
index
e1216cf
..
f9070b4
100644
(file)
--- a/
sprite.h
+++ b/
sprite.h
@@
-8,9
+8,9
@@
typedef struct sprite Sprite;
#define SPRITE(x) ((Sprite *) (x))
#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 {
#define N_TYPES 3
struct sprite {
@@
-27,7
+27,11
@@
struct sprite {
Sprite *free_sprites[N_TYPES]; // lists of free sprites, by type.
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 init_sprites(void);
+void reset_sprites(void);
void add_sprite(Sprite *s);
void move_sprite(Sprite *s);
void move_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;
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);
}
dest.x = s->x; dest.y = s->y;
SDL_BlitSurface(s->image, NULL, surf_screen, &dest);
}