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

diff --git a/rocks.c b/rocks.c
index 9384fe0..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"
@@ -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();