ditched the separate shape struct.

[vor.git] / rocks.c

diff --git a/rocks.c b/rocks.c
index d395d5d..a32652a 100644 (file)
--- a/rocks.c
+++ b/rocks.c
@@ -9,32 +9,20 @@
 #include "globals.h"
 #include "mt.h"
 #include "rocks.h"
-#include "shape.h"
 
-SDL_Surface *load_image(char *filename);
+struct rock rocks[MAXROCKS], *free_rocks;
 
-struct rock_struct {
-       struct rock_struct *next;
-       float x,y,dx,dy;
-       SDL_Surface *image;
-       struct shape *shape;
-       int type_number;
-}; 
-
-struct rock_struct rocks[MAXROCKS], *free_rocks;
-
-struct rock_struct **rock_buckets[2];
+struct rock **rock_buckets[2];
 int n_buckets;
 // we have two sets of buckets -- this variable tells which we are using.
 int p;
 int bw, bh;
 int grid_size;
 
-SDL_Surface *surf_rock[NROCKS];
-struct shape rock_shapes[NROCKS];
+static struct rock prototypes[NROCKS];
 
 // timers for rock generation.
-float rtimers[4];
+static float rtimers[4];
 
 uint32_t nrocks;
 float nrocks_timer;
@@ -46,7 +34,7 @@ float nrocks_inc_ticks = 2*60*20/(F_ROCKS-I_ROCKS);
 #define RDX 2.5  // range for rock dx values (+/-)
 #define RDY 2.5  // range for rock dy values (+/-)
 
-static inline struct rock_struct **
+static inline struct rock **
 bucket(int x, int y, int p)
 {
        int b = (x+grid_size)/grid_size + bw*((y+grid_size)/grid_size);
@@ -62,8 +50,8 @@ init_buckets(void)
        bh = 1 + scr_grid_h + 1;
        n_buckets = bw * bh;
        
-       rock_buckets[0] = malloc(n_buckets * sizeof(struct rock_struct *));
-       rock_buckets[1] = malloc(n_buckets * sizeof(struct rock_struct *));
+       rock_buckets[0] = malloc(n_buckets * sizeof(struct rock *));
+       rock_buckets[1] = malloc(n_buckets * sizeof(struct rock *));
        if(!rock_buckets[0] || !rock_buckets[1]) {
                fprintf(stderr, "Can't allocate rock buckets.\n");
                exit(1);
@@ -72,7 +60,7 @@ init_buckets(void)
 }
 
 void
-transfer_rock(struct rock_struct *r, struct rock_struct **from, struct rock_struct **to)
+transfer_rock(struct rock *r, struct rock **from, struct rock **to)
 {
        *from = r->next;
        r->next = *to;
@@ -85,8 +73,11 @@ reset_rocks(void)
        int i;
 
        for(i=0; i<MAXROCKS; i++) rocks[i].image = NULL;
-       rocks[0].next = NULL; free_rocks = &rocks[MAXROCKS-1];
-       for(i = 1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
+
+       rocks[0].next = NULL;
+       for(i=1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
+       free_rocks = &rocks[MAXROCKS-1];
+
        for(i = 0; i<n_buckets; i++) {
                rock_buckets[0][i] = NULL;
                rock_buckets[1][i] = NULL;
@@ -107,10 +98,9 @@ init_rocks(void)
 
        for(i = 0; i<NROCKS; i++) {
                snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
-               NULLERROR(surf_rock[i] = load_image(a));
-               get_shape(surf_rock[i], &rock_shapes[i]);
-               maxw = max(maxw, rock_shapes[i].w);
-               maxh = max(maxh, rock_shapes[i].h);
+               load_sprite(SPRITE(&prototypes[i]), a);
+               maxw = max(maxw, prototypes[i].w);
+               maxh = max(maxh, prototypes[i].h);
        }
        grid_size = max(maxw, maxh) * 3 / 2;
        init_buckets();
@@ -189,8 +179,8 @@ weighted_rnd_range(float min, float max) {
 void
 new_rocks(void)
 {
-       int i;
-       struct rock_struct *r;
+       int i, type;
+       struct rock *r, **tmp;
        float ti[4];
        float rmin[4];
        float rmax[4];
@@ -213,10 +203,10 @@ new_rocks(void)
                while(rtimers[i] >= 1) {
                        rtimers[i] -= 1;
                        if(!free_rocks) return;  // sorry, we ran out of rocks!
-                       r = free_rocks;
-                       r->type_number = urnd() % NROCKS;
-                       r->image = surf_rock[r->type_number];
-                       r->shape = &rock_shapes[r->type_number];
+                       r = free_rocks; free_rocks = r->next;
+                       type = urnd() % NROCKS;
+                       *r = prototypes[type];
+                       r->type = type;
                        switch(i) {
                                case RIGHT:
                                        r->x = XSIZE;
@@ -247,7 +237,8 @@ new_rocks(void)
                                        r->dy = weighted_rnd_range(rmin[i], rmax[i]) + screendy;
                                        break;
                        }
-                       transfer_rock(r, &free_rocks, bucket(r->x, r->y, p));
+                       tmp = bucket(r->x, r->y, p);
+                       r->next = *tmp; *tmp = r;
                }
        }
 }
@@ -256,8 +247,8 @@ void
 move_rocks(void)
 {
        int b;
-       struct rock_struct **head;
-       struct rock_struct *r;
+       struct rock **head;
+       struct rock *r;
 
        // Move all the rocks
        for(b=0; b<n_buckets; b++) {
@@ -295,49 +286,48 @@ draw_rocks(void)
 }
 
 int
-hit_in_bucket(struct rock_struct *r, float x, float y, struct shape *shape)
+hit_in_bucket(struct rock *r, Sprite *s)
 {
        for(; r; r=r->next) {
-               if(collide(x - r->x, y - r->y, r->shape, shape)) return 1;
+               if(collide(SPRITE(r), s)) return true;
        }
-       return 0;
+       return false;
 }
 
 int
-hit_rocks(float x, float y, struct shape *shape)
+hit_rocks(Sprite *s)
 {
-       int ix, iy;
        int l, r, t, b;
-       struct rock_struct **bucket;
+       struct rock **bucket;
 
-       ix = x + grid_size; iy = y + grid_size;
-       l = ix / grid_size; r = (ix+shape->w)/grid_size;
-       t = iy / grid_size; b = (iy+shape->h)/grid_size;
+       l = (s->x + grid_size) / grid_size;
+       r = (s->x + s->w + grid_size) / grid_size;
+       t = (s->y + grid_size) / grid_size;
+       b = (s->y + s->h + grid_size) / grid_size;
        bucket = &rock_buckets[p][l + t*bw];
 
-       if(hit_in_bucket(*bucket, x, y, shape)) return true;
-       if(l && hit_in_bucket(*(bucket-1), x, y, shape)) return true;
-       if(t && hit_in_bucket(*(bucket-bw), x, y, shape)) return true;
-       if(l && t && hit_in_bucket(*(bucket-(1+bw)), x, y, shape)) return true;
+       if(hit_in_bucket(*bucket, s)) return true;
+       if(l > 0 && hit_in_bucket(*(bucket-1), s)) return true;
+       if(t > 0 && hit_in_bucket(*(bucket-bw), s)) return true;
+       if(l > 0 && t > 0 && hit_in_bucket(*(bucket-1-bw), s)) return true;
 
        if(r > l) {
-               if(hit_in_bucket(*(bucket+1), x, y, shape)) return true;
-               if(hit_in_bucket(*(bucket+1-bw), x, y, shape)) return true;
+               if(hit_in_bucket(*(bucket+1), s)) return true;
+               if(t > 0 && hit_in_bucket(*(bucket+1-bw), s)) return true;
        }
-       if(t > b) {
-               if(hit_in_bucket(*(bucket+bw), x, y, shape)) return true;
-               if(hit_in_bucket(*(bucket+bw-1), x, y, shape)) return true;
+       if(b > t) {
+               if(hit_in_bucket(*(bucket+bw), s)) return true;
+               if(l > 0 && hit_in_bucket(*(bucket-1+bw), s)) return true;
        }
-       if(r > l && t > b && hit_in_bucket(*(bucket+bw+1), x, y, shape)) return true;
+       if(r > l && b > t && hit_in_bucket(*(bucket+1+bw), s)) return true;
        return false;
 }
 
 int
-pixel_hit_in_bucket(struct rock_struct *r, float x, float y)
+pixel_hit_in_bucket(struct rock *r, float x, float y)
 {
        for(; r; r=r->next) {
-               if(x < r->x || y < r->y) continue;
-               if(pixel_collide(x - r->x, y - r->y, r->shape)) return 1;
+               if(pixel_collide(SPRITE(r), x, y)) return 1;
        }
        return 0;
 }
@@ -347,15 +337,15 @@ pixel_hit_rocks(float x, float y)
 {
        int ix, iy;
        int l, t;
-       struct rock_struct **bucket;
+       struct rock **bucket;
 
        ix = x + grid_size; iy = y + grid_size;
        l = ix / grid_size; t = iy / grid_size;
        bucket = &rock_buckets[p][l + t*bw];
        if(pixel_hit_in_bucket(*bucket, x, y)) return true;
-       if(l && pixel_hit_in_bucket(*(bucket-1), x, y)) return true;
-       if(t && pixel_hit_in_bucket(*(bucket-bw), x, y)) return true;
-       if(l && t && pixel_hit_in_bucket(*(bucket-(bw+1)), x, y)) return true;
+       if(l > 0 && pixel_hit_in_bucket(*(bucket-1), x, y)) return true;
+       if(t > 0 && pixel_hit_in_bucket(*(bucket-bw), x, y)) return true;
+       if(l > 0 && t > 0 && pixel_hit_in_bucket(*(bucket-1-bw), x, y)) return true;
        return false;
 }
 
@@ -363,7 +353,7 @@ void
 blast_rocks(float x, float y, float radius, int onlyslow)
 {
        int b;
-       struct rock_struct *r;
+       struct rock *r;
        float dx, dy, n;
 
        if(onlyslow) return;