X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=8c8c4efa803835c190d553ecea32e73a216aebf7;hb=d191c2bde6e8f0bec6b56aaf88d9c66e41169980;hp=4a482fc6b00756074dc4afe5108dd0159acb77a3;hpb=647f72d2ed554c7e2b1923d485e99d89f3a17825;p=vor.git

diff --git a/main.c b/main.c
index 4a482fc..8c8c4ef 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"
@@ -137,6 +138,7 @@ extern int optind, opterr, optopt;
 
 // ************************************* FUNCS
 
+#ifdef nanosleep
 void
 tiny_sleep() {
 	struct timespec t;
@@ -144,6 +146,9 @@ tiny_sleep() {
 	t.tv_nsec = 1;
 	nanosleep(&t, 0);
 }
+#else
+#define tiny_sleep()
+#endif
 
 void
 init_engine_dots() {
@@ -334,6 +339,21 @@ draw_dots(void) {
 }
 
 SDL_Surface *
+load_image_alpha(char *filename)
+{
+	SDL_Surface *tmp, *img = NULL;
+	char *s = add_data_path(filename);
+	if(s) {
+		tmp = IMG_Load(s);
+		free(s);
+		if(tmp) {
+			return tmp;
+		}
+	}
+	return img;
+}
+
+SDL_Surface *
 load_image(char *filename)
 {
 	SDL_Surface *tmp, *img = NULL;
@@ -426,12 +446,12 @@ init(void) {
 	}
 
 	// Load the banners
-	NULLERROR(surf_b_variations = load_image("b_variations.png"));
-	NULLERROR(surf_b_on = load_image("b_on.png"));
-	NULLERROR(surf_b_rockdodger = load_image("b_rockdodger.png"));
+	NULLERROR(surf_b_variations = load_image_alpha("b_variations.png"));
+	NULLERROR(surf_b_on = load_image_alpha("b_on.png"));
+	NULLERROR(surf_b_rockdodger = load_image_alpha("b_rockdodger.png"));
 
-	NULLERROR(surf_b_game = load_image("b_game.png"));
-	NULLERROR(surf_b_over = load_image("b_over.png"));
+	NULLERROR(surf_b_game = load_image_alpha("b_game.png"));
+	NULLERROR(surf_b_over = load_image_alpha("b_over.png"));
 
 	// Load the life indicator (small ship) graphic.
 	NULLERROR(surf_life = load_image("life.png"));
@@ -530,7 +550,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);
 }