X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=globals.h;h=0b76cd7bb3cabf8c490d7ac4e595e7e0930dcf0c;hp=4eb58f11717e753852870094357aba67b4ddf992;hb=HEAD;hpb=286cb1818d7d2787c8a19f5cf34947e7300bc536

diff --git a/globals.h b/globals.h
index 4eb58f1..0b76cd7 100644
--- a/globals.h
+++ b/globals.h
@@ -2,33 +2,8 @@
 #define VOR_GLOBALS_H
 
 #include <SDL.h>
-#include "shape.h"
-#include "SFont.h"
-
-struct bangdots {
-	// Bang dots have the same colour as shield dots.
-	// Bang dots get darker as they age.
-	// Some are coloured the same as the ex-ship.
-	float x,y,dx,dy;
-	Uint16 c; // when zero, use heatcolor[bangdotlife]
-	float life;	// When reduced to 0, set active = 0
-	int active;
-	float decay;// Amount by which to reduce life each time dot is drawn
-};
-struct enginedots {
-	// Engine dots stream out the back of the ship, getting darker as they go.
-	int active;
-	float x,y,dx,dy;
-	// The life of an engine dot 
-	// 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;
-};
+#include <inttypes.h>
+#include "font.h"
 
 // ************************************* VARS
 // SDL_Surface global variables
@@ -44,35 +19,18 @@ extern SDL_Surface
 	*surf_rock[NROCKS],	// THE ROCKS
 	*surf_font_big;	// The big font
 
-extern SFont_Font *g_font;
-
-extern uint32_t area;
+extern float t_frame;
 
-// Structure global variables
-extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
-extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
-extern struct spacedot sdot[MAXSPACEDOTS];
+extern font *g_font;
 
 // 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 xscroll, yscroll;
-extern float yscroll;
-extern float scrollvel;
 
-// all movement is based on s_frame.
-float t_frame;  // length of this frame (in ticks = 1/20th second)
-int ms_frame;   // length of this frame (milliseconds)
-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;
@@ -85,4 +43,6 @@ extern Uint16 heatcolor[W*3];
 
 extern char *data_dir;
 
+extern uint32_t initial_rocks, final_rocks;
+
 #endif // VOR_GLOBALS_H