X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=528509c0777e911ccdc36a53dcddbef18dc5639c;hp=1d4ce85246f6f96f387442697b31fcae800ff5e0;hb=refs%2Fheads%2Fopengl;hpb=923a1c77954f93d107b54c39da7ff63d4f5ffadd diff --git a/main.c b/main.c index 1d4ce85..528509c 100644 --- a/main.c +++ b/main.c @@ -339,21 +339,35 @@ draw_dots(void) { } SDL_Surface * -load_image(char *filename) -{ +_load_image(char *filename, int alpha) { SDL_Surface *tmp, *img = NULL; char *s = add_data_path(filename); if(s) { tmp = IMG_Load(s); free(s); if(tmp) { - img = SDL_DisplayFormat(tmp); + if(alpha) { + img = SDL_DisplayFormatAlpha(tmp); + } else { + img = SDL_DisplayFormat(tmp); + } SDL_FreeSurface(tmp); } } return img; } +SDL_Surface * +load_image(char *filename) { + return _load_image(filename, 0); +} + +SDL_Surface * +load_image_alpha(char *filename) { + return _load_image(filename, 1); +} + + void load_ship(void) { @@ -431,12 +445,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"));