bump version to 0.5.8

[vor.git] / globals.h

diff --git a/globals.h b/globals.h
index bf5e1da..0b76cd7 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -2,27 +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
-};
+#include <inttypes.h>
+#include "font.h"
 
 // ************************************* VARS
 // SDL_Surface global variables
@@ -38,31 +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 font *g_font;
 
 // Other global variables
 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 +43,6 @@ extern Uint16 heatcolor[W*3];
 
 extern char *data_dir;
 
+extern uint32_t initial_rocks, final_rocks;
+
 #endif // VOR_GLOBALS_H