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
inching towards opengl
[vor.git]
/
main.c
diff --git
a/main.c
b/main.c
index
4a482fc
..
528509c
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,6
+32,7
@@
#include "args.h"
#include "common.h"
#include "args.h"
#include "common.h"
+#include <config.h>
#include "vorconfig.h"
#include "dust.h"
#include "file.h"
#include "vorconfig.h"
#include "dust.h"
#include "file.h"
@@
-137,6
+138,7
@@
extern int optind, opterr, optopt;
// ************************************* FUNCS
// ************************************* FUNCS
+#ifdef HAVE_NANOSLEEP
void
tiny_sleep() {
struct timespec t;
void
tiny_sleep() {
struct timespec t;
@@
-144,6
+146,9
@@
tiny_sleep() {
t.tv_nsec = 1;
nanosleep(&t, 0);
}
t.tv_nsec = 1;
nanosleep(&t, 0);
}
+#else
+#define tiny_sleep()
+#endif
void
init_engine_dots() {
void
init_engine_dots() {
@@
-334,21
+339,35
@@
draw_dots(void) {
}
SDL_Surface *
}
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) {
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_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)
{
void
load_ship(void)
{
@@
-426,12
+445,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"));
@@
-530,7
+549,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);
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);
}
x = (XSIZE-font_width(text))/2 + sin(fadetimer/4.5)*10;
font_write(x,YSIZE-50 + sin(fadetimer/2)*5,text);
}