X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=ff8f8f96a1a0aaa9f89bf04539b745e9f00fae31;hp=ed98cac172b5781bd55f2a13ef705a8285eecfcd;hb=HEAD;hpb=038a8a4aaa54b7b60e7fbb6a0f988dd852fb8970

diff --git a/rocks.c b/rocks.c
index ed98cac..ff8f8f9 100644
--- a/rocks.c
+++ b/rocks.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 #include "globals.h"
 #include "mt.h"
@@ -37,7 +37,7 @@ reset_rocks(void)
 	nrocks_timer = 0;
 }
 
-#define ROCK_LEN sizeof("sprites/rockXX.png")
+#define ROCK_LEN sizeof("rockXX.png")
 
 void
 load_rocks(void)
@@ -46,7 +46,7 @@ load_rocks(void)
 	char a[ROCK_LEN];
 
 	for(i=0; i<NROCKS; i++) {
-		snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
+		snprintf(a, ROCK_LEN, "rock%02d.png", i);
 		load_sprite(SPRITE(&prototypes[i]), a);
 		prototypes[i].sprite_type = ROCK;
 		prototypes[i].flags = MOVE|DRAW|COLLIDE;
@@ -159,6 +159,7 @@ new_rocks(void)
 			type = urnd() % NROCKS;
 			*r = prototypes[type];
 			r->type = type;
+			r->life = r->area * 300;
 			switch(i) {
 				case RIGHT:
 					r->x = XSIZE;
@@ -175,14 +176,14 @@ new_rocks(void)
 					r->dy = RDY*crnd();
 					break;
 				case BOTTOM:
-					r->x = frnd()*(XSIZE + r->image->w);
+					r->x = (frnd()*(XSIZE + r->image->w)) - r->image->w;
 					r->y = YSIZE;
 
 					r->dx = RDX*crnd();
 					r->dy = -weighted_rnd_range(rmin[i], rmax[i]) + screendy;
 					break;
 				case TOP:
-					r->x = frnd()*(XSIZE + r->image->w);
+					r->x = (frnd() * (XSIZE + r->image->w)) - r->image->w;
 					r->y = -r->image->h;
 
 					r->dx = RDX*crnd();
@@ -201,27 +202,3 @@ draw_rocks(void)
 	int i;
 	for(i=0; i<MAXROCKS; i++) draw_sprite(SPRITE(&rocks[i]));
 }
-
-void
-blast_rocks(float x, float y, float radius)
-{
-	int i;
-	Sprite *r;
-	float dx, dy, n;
-
-	for(i=0; i<MAXROCKS; i++) {
-		if(!rocks[i].flags) continue;
-		r = SPRITE(&rocks[i]);
-		if(r->x <= 0) continue;
-
-		dx = r->x - x;
-		dy = r->y - y;
-
-		n = sqrt(dx*dx + dy*dy);
-		if(n < radius) {
-			n *= 15;
-			r->dx += 54.0*dx/n;
-			r->dy += 54.0*dy/n;
-		}
-	}
-}