oops, didn't fix bang dots correctly.

[vor.git] / globals.h

diff --git a/globals.h b/globals.h
index a682d47..a16e9f8 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -2,7 +2,7 @@
 #define VOR_GLOBALS_H
 
 #include <SDL.h>
-#include "shape.h"
+#include <inttypes.h>
 #include "SFont.h"
 
 struct bangdots {
@@ -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
 };
-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
@@ -46,37 +40,22 @@ extern SDL_Surface
 
 extern SFont_Font *g_font;
 
-extern uint32_t area;
-
 // Structure global variables
 extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
 extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
-extern struct spacedot sdot[MAXSPACEDOTS];
-
-// command-line arguments
-extern int opt_fullscreen;
-extern int opt_sound;
-extern int opt_music;
-extern float opt_gamespeed;
-extern int opt_tail_engine;
-extern int opt_friction;
 
 // 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 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;
+// 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 score;
+extern int g_easy;
 extern float fadetimer, faderate;
 
 extern int pausedown, paused;
@@ -89,4 +68,6 @@ extern Uint16 heatcolor[W*3];
 
 extern char *data_dir;
 
+extern uint32_t initial_rocks, final_rocks;
+
 #endif // VOR_GLOBALS_H