X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=0af1fddee32a50730e43c881607d83e9d2d839c5;hp=b7332c5beb00b665ecc65f118c8ee847ed847ef7;hb=HEAD;hpb=a71a81a281923a4dba48a01e1c448d3a44b60bf0

diff --git a/main.c b/main.c
index b7332c5..0af1fdd 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@
 
 #include "args.h"
 #include "common.h"
+#include <config.h>
 #include "vorconfig.h"
 #include "dust.h"
 #include "file.h"
@@ -60,6 +61,9 @@ SDL_Surface
 
 font *g_font;
 
+#define ENGINEDOT 0
+#define BANGDOT 1
+
 struct dot {
 	int active;
 	float x, y;
@@ -67,6 +71,7 @@ struct dot {
 	float mass;   // in DOT_MASS_UNITs
 	float decay;  // rate at which to reduce mass.
 	int heat;     // heat multiplier (color).
+	uint8_t type;  // BANGDOT or ENGINEDOT
 };
 
 void draw(void);
@@ -117,12 +122,12 @@ char *msgs[2][3] = {
 	{
 		"Press SPACE for normal game",
 		"Press '1' for easy game",
-		"http://jasonwoof.org/vor"
+		"https://sametwice.com/vor"
 	},
 	{
 		"Press SPACE for easy game",
 		"Press '2' for normal game",
-		"http://jasonwoof.org/vor"
+		"https://sametwice.com/vor"
 	}
 };
 
@@ -137,7 +142,7 @@ extern int optind, opterr, optopt;
 
 // ************************************* FUNCS
 
-#ifdef nanosleep
+#ifdef HAVE_NANOSLEEP
 void
 tiny_sleep() {
 	struct timespec t;
@@ -150,10 +155,15 @@ tiny_sleep() {
 #endif
 
 void
-init_engine_dots() {
+init_dots() {
 	int i;
 	for(i = 0; i<MAXENGINEDOTS; i++) {
 		edot[i].active = 0;
+		edot[i].type = ENGINEDOT;
+	}
+	for(i = 0; i<MAXBANGDOTS; i++) {
+		bdot[i].active = 0;
+		bdot[i].type = BANGDOT;
 	}
 }
 
@@ -277,6 +287,10 @@ new_bang_dots(struct sprite *s)
 	if(SDL_MUSTLOCK(img)) { SDL_UnlockSurface(img); }
 }
 
+void
+kill_rock(struct rock *r) {
+	r->x = -200;
+}
 
 void
 move_dot(struct dot *d)
@@ -295,6 +309,13 @@ move_dot(struct dot *d)
 			if(hit) if(hit->type != SHIP) {
 				d->active = 0;
 				mass = sprite_mass(hit);
+				if(d->type == BANGDOT) {
+					struct rock *rock = (struct rock*)hit;
+					rock->life -= (d->dx - hit->dx) * (d->dx - hit->dx) + (d->dy - hit->dy) * (d->dy - hit->dy);
+					if(rock->life < 0) {
+						kill_rock(rock);
+					}
+				}
 				hit->dx += DOT_MASS_UNIT * d->mass * (d->dx - hit->dx) / mass;
 				hit->dy += DOT_MASS_UNIT * d->mass * (d->dy - hit->dy) / mass;
 			}
@@ -450,7 +471,7 @@ init(void) {
 		exit(1);
 	}
 
-	init_engine_dots();
+	init_dots();
 	init_dust();
 
 	init_sprites();
@@ -534,7 +555,7 @@ draw_title_page(void)
 	x = (XSIZE-font_width(text))/2 + cos(fadetimer/4.5)*10;
 	font_write(x,YSIZE-100 + cos(fadetimer/3)*5,text);
 
-	text = "Version " VERSION;
+	text = "Version " PACKAGE_VERSION;
 	x = (XSIZE-font_width(text))/2 + sin(fadetimer/4.5)*10;
 	font_write(x,YSIZE-50 + sin(fadetimer/2)*5,text);
 }
@@ -711,6 +732,12 @@ gameloop() {
 									SDL_SaveBMP(surf_screen, screenshot_filename);
 								}
 								break;
+							case SDLK_SPACE:
+								if(state != GAMEPLAY && state != DEAD_PAUSE) {
+									// don't conflict with space key to start a new game
+									break;
+								}
+								// else fall through
 							case SDLK_p:
 							case SDLK_PAUSE:
 								paused = !paused;