Changes from August-November 2006 -- detailed history was lost.

[vor.git] / globals.h

diff --git a/globals.h b/globals.h
index bf5e1da..7f47314 100644 (file)
--- 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,19 +48,10 @@ extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
 extern char topline[1024];
 extern char *initerror;
 
-extern struct shape shipshape;
-extern float shipx,shipy;      // ship position on screen
-extern float shipdx,shipdy;    // ship speed (pixels/tick)
 extern float screendx, screendy;
-extern float xscroll, yscroll;
-extern float yscroll;
-extern float scrollvel;
-
-// All movement is based on t_frame.
-// All speeds are pixels/tick, with 20 ticks per second.
-extern float t_frame;  // length of this frame (in ticks = 1/20th second)
 
-extern int nships,score;
+extern int score;
+extern int g_easy;
 extern float fadetimer, faderate;
 
 extern int pausedown, paused;
@@ -75,4 +64,6 @@ extern Uint16 heatcolor[W*3];
 
 extern char *data_dir;
 
+extern uint32_t initial_rocks, final_rocks;
+
 #endif // VOR_GLOBALS_H