X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=8c8c4efa803835c190d553ecea32e73a216aebf7;hb=d191c2bde6e8f0bec6b56aaf88d9c66e41169980;hp=708a1fa2eefcfb7c48cde8b300820dc42848284d;hpb=44df38242a1c6e277a6067948e70d1ccd756f926;p=vor.git diff --git a/main.c b/main.c index 708a1fa..8c8c4ef 100644 --- a/main.c +++ b/main.c @@ -32,7 +32,7 @@ #include "args.h" #include "common.h" -#include "config.h" +#include #include "vorconfig.h" #include "dust.h" #include "file.h" @@ -339,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; @@ -431,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"));