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
Removed unnecessary command-line options.
[vor.git]
/
globals.h
diff --git
a/globals.h
b/globals.h
index
e6b1905
..
7f47314
100644
(file)
--- a/
globals.h
+++ b/
globals.h
@@
-2,8
+2,8
@@
#define VOR_GLOBALS_H
#include <SDL.h>
#define VOR_GLOBALS_H
#include <SDL.h>
-#include "shape.h"
-#include "SFont.h"
+#include <inttypes.h>
+#include "font.h"
struct bangdots {
// Bang dots have the same colour as shield dots.
struct bangdots {
// Bang dots have the same colour as shield dots.
@@
-23,12
+23,6
@@
struct enginedots {
// is a number starting at between 0 and 50 and counting backward.
float life; // When reduced to 0, set active = 0
};
// is a number starting at between 0 and 50 and counting backward.
float life; // When reduced to 0, set active = 0
};
-struct spacedot {
- // Space dots are harmless background items
- // All are active. When one falls off the edge, another is created at the start.
- float x,y,z;
- Uint16 color;
-};
// ************************************* VARS
// SDL_Surface global variables
// ************************************* VARS
// SDL_Surface global variables
@@
-44,31
+38,20
@@
extern SDL_Surface
*surf_rock[NROCKS], // THE ROCKS
*surf_font_big; // The big font
*surf_rock[NROCKS], // THE ROCKS
*surf_font_big; // The big font
-extern SFont_Font *g_font;
-
-extern uint32_t area;
+extern font *g_font;
// Structure global variables
extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
// Structure global variables
extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
-extern struct spacedot sdot[MAXSPACEDOTS];
// Other global variables
extern char topline[1024];
extern char *initerror;
// Other global variables
extern char topline[1024];
extern char *initerror;
-extern struct shape shipshape;
-extern float shipx,shipy; // X position, 0..XSIZE
-extern float shipdx,shipdy; // Change in X position per tick.
extern float screendx, screendy;
extern float screendx, screendy;
-extern float xscroll, yscroll;
-extern float gamerate; // this controls the speed of everything that moves.
-extern float yscroll;
-extern float scrollvel;
-extern int nships,score,initticks,ticks_since_last, last_ticks;
-extern int gameover;
-extern int maneuver;
+extern int score;
+extern int g_easy;
extern float fadetimer, faderate;
extern int pausedown, paused;
extern float fadetimer, faderate;
extern int pausedown, paused;
@@
-81,4
+64,6
@@
extern Uint16 heatcolor[W*3];
extern char *data_dir;
extern char *data_dir;
+extern uint32_t initial_rocks, final_rocks;
+
#endif // VOR_GLOBALS_H
#endif // VOR_GLOBALS_H