X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=globals.h;h=7f4731484b6559efad703e565867c04ed04a13aa;hp=8d0d962cb154ec607a32cacfad6955f6a818928f;hb=88a9e026caed5568363cefb7d49308b875dc5e4a;hpb=841f94c4182f8dff0253db9bae4922c3c9039a5f

diff --git a/globals.h b/globals.h
index 8d0d962..7f47314 100644
--- a/globals.h
+++ b/globals.h
@@ -2,8 +2,8 @@
 #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.
@@ -38,9 +38,7 @@ extern SDL_Surface
 	*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;
@@ -50,23 +48,10 @@ extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
 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 xscroll, yscroll;
-extern float yscroll;
-extern float scrollvel;
-
-// all movement is based on s_frame.
-extern float t_frame;  // length of this frame (in ticks = 1/20th second)
-extern float s_frame;  // length of this frame (seconds)
-extern int ms_frame;   // length of this frame (milliseconds)
-extern int ms_end;     // end of this frame (milliseconds)
 
-extern int nships,score;
-extern int gameover;
-extern int maneuver;
+extern int score;
+extern int g_easy;
 extern float fadetimer, faderate;
 
 extern int pausedown, paused;
@@ -79,4 +64,6 @@ extern Uint16 heatcolor[W*3];
 
 extern char *data_dir;
 
+extern uint32_t initial_rocks, final_rocks;
+
 #endif // VOR_GLOBALS_H