X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=d01d7949086728c234b31b4e52b2d14d86b6ec01;hp=d395d5d8fab329923e524253a2bfbad320fdc978;hb=f8a464d8eed8cf611c0c3f80166d2a650efb1485;hpb=da1d3fc11c5663c03da7e9cfb9c9a9e616e692ac

diff --git a/rocks.c b/rocks.c
index d395d5d..d01d794 100644
--- a/rocks.c
+++ b/rocks.c
@@ -9,21 +9,10 @@
 #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;
@@ -46,7 +35,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 +51,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,10 +61,10 @@ 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;
+	*from = &r->next->rock;
+	r->next = SPRITE(*to);
 	*to = r;
 }
 
@@ -86,7 +75,7 @@ reset_rocks(void)
 
 	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];
+	for(i = 1; i<MAXROCKS; i++) rocks[i].next = SPRITE(&rocks[i-1]);
 	for(i = 0; i<n_buckets; i++) {
 		rock_buckets[0][i] = NULL;
 		rock_buckets[1][i] = NULL;
@@ -190,7 +179,7 @@ void
 new_rocks(void)
 {
 	int i;
-	struct rock_struct *r;
+	struct rock *r;
 	float ti[4];
 	float rmin[4];
 	float rmax[4];
@@ -214,9 +203,9 @@ new_rocks(void)
 			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->type = urnd() % NROCKS;
+			r->image = surf_rock[r->type];
+			r->shape = &rock_shapes[r->type];
 			switch(i) {
 				case RIGHT:
 					r->x = XSIZE;
@@ -256,8 +245,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,47 +284,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;
+	for(; r; r=&r->next->rock) {
+		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;
+	struct base_sprite *sp = &s->sprite;
 	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 = (sp->x + grid_size) / grid_size;
+	r = (sp->x + sp->shape->w + grid_size) / grid_size;
+	t = (sp->y + grid_size) / grid_size;
+	b = (sp->y + sp->shape->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) {
+	for(; r; r=&r->next->rock) {
 		if(x < r->x || y < r->y) continue;
 		if(pixel_collide(x - r->x, y - r->y, r->shape)) return 1;
 	}
@@ -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,13 +353,13 @@ 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;
 
 	for(b=0; b<n_buckets; b++) {
-		for(r=rock_buckets[p][b]; r; r=r->next) {
+		for(r=rock_buckets[p][b]; r; r=&r->next->rock) {
 			if(r->x <= 0) continue;
 
 			// This makes it so your explosion from dying magically doesn't leave