X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=globals.h;h=11ae5c4c487e130150b65c041b5deed3efc3e3bb;hp=8d0d962cb154ec607a32cacfad6955f6a818928f;hb=bb819ae60e78c875e66fe2de3ac7fa2b9824a1e5;hpb=841f94c4182f8dff0253db9bae4922c3c9039a5f diff --git a/globals.h b/globals.h index 8d0d962..11ae5c4 100644 --- a/globals.h +++ b/globals.h @@ -2,7 +2,6 @@ #define VOR_GLOBALS_H #include -#include "shape.h" #include "SFont.h" struct bangdots { @@ -40,8 +39,6 @@ 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; @@ -50,23 +47,16 @@ 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. +// 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 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 float fadetimer, faderate; extern int pausedown, paused;