X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=c6d48e21f56e6d400e9685b6d97ec7e60025473b;hb=ed073069f4b2813fee191de449e51cc88cd21935;hp=a2d2e930d68bb080481b451ea98d86c9dc6fc245;hpb=ca648507d88cc3e3f0ee264e1bb94f3e8c31192e;p=vor.git

diff --git a/main.c b/main.c
index a2d2e93..c6d48e2 100644
--- a/main.c
+++ b/main.c
@@ -26,12 +26,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "font.h"
 
 #include "args.h"
 #include "common.h"
-#include "config.h"
+#include <config.h>
+#include "vorconfig.h"
 #include "dust.h"
 #include "file.h"
 #include "float.h"
@@ -136,6 +138,18 @@ extern int optind, opterr, optopt;
 
 // ************************************* FUNCS
 
+#ifdef nanosleep
+void
+tiny_sleep() {
+	struct timespec t;
+	t.tv_sec = 0;
+	t.tv_nsec = 1;
+	nanosleep(&t, 0);
+}
+#else
+#define tiny_sleep()
+#endif
+
 void
 init_engine_dots() {
 	int i;
@@ -325,6 +339,22 @@ 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) {
+			img = SDL_DisplayFormatAlpha(tmp);
+			SDL_FreeSurface(tmp);
+		}
+	}
+	return img;
+}
+
+SDL_Surface *
 load_image(char *filename)
 {
 	SDL_Surface *tmp, *img = NULL;
@@ -417,12 +447,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"));
@@ -521,7 +551,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);
 }
@@ -835,6 +865,8 @@ gameloop() {
 			state = HIGH_SCORE_DISPLAY;
 			state_timeout = 400;
 		}
+
+		tiny_sleep();
 	}
 }