bump version to 0.5.8

[vor.git] / rocks.c

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