X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=globals.h;h=bf5e1daf02f0429fa424d040d95ad16f83c56fa5;hp=a682d4729e03a3c2d8f7cee52a958c50bcdd9884;hb=cd7fb220b16a73c15ff9dff7a5627bf78478875f;hpb=f8b249157652f109467064877561955910f98fc1 diff --git a/globals.h b/globals.h index a682d47..bf5e1da 100644 --- a/globals.h +++ b/globals.h @@ -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 @@ -51,32 +45,24 @@ 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 shipx,shipy; // ship position on screen +extern float shipdx,shipdy; // ship speed (pixels/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 nships,score; extern float fadetimer, faderate; extern int pausedown, paused;