Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also works for crc
[vor.git]
/
main.c
diff --git
a/main.c
b/main.c
index
708a1fa
..
8c8c4ef
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,7
+32,7
@@
#include "args.h"
#include "common.h"
#include "args.h"
#include "common.h"
-#include "config.h"
+#include <config.h>
#include "vorconfig.h"
#include "dust.h"
#include "file.h"
#include "vorconfig.h"
#include "dust.h"
#include "file.h"
@@
-339,6
+339,21
@@
draw_dots(void) {
}
SDL_Surface *
}
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;
load_image(char *filename)
{
SDL_Surface *tmp, *img = NULL;
@@
-431,12
+446,12
@@
init(void) {
}
// Load the banners
}
// 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"));
// Load the life indicator (small ship) graphic.
NULLERROR(surf_life = load_image("life.png"));