Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rewording bounce calculations.
[vor.git]
/
globals.h
diff --git
a/globals.h
b/globals.h
index
fb68ef6
..
11ae5c4
100644
(file)
--- a/
globals.h
+++ b/
globals.h
@@
-2,7
+2,6
@@
#define VOR_GLOBALS_H
#include <SDL.h>
#define VOR_GLOBALS_H
#include <SDL.h>
-#include "shape.h"
#include "SFont.h"
struct bangdots {
#include "SFont.h"
struct bangdots {
@@
-23,12
+22,6
@@
struct enginedots {
// is a number starting at between 0 and 50 and counting backward.
float life; // When reduced to 0, set active = 0
};
// 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
// ************************************* VARS
// SDL_Surface global variables
@@
-46,34
+39,24
@@
extern SDL_Surface
extern SFont_Font *g_font;
extern SFont_Font *g_font;
-extern uint32_t area;
-
// Structure global variables
extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
// Structure global variables
extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
-extern struct spacedot sdot[MAXSPACEDOTS];
// Other global variables
extern char topline[1024];
extern char *initerror;
// 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;
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 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;
extern float fadetimer, faderate;
extern int pausedown, paused;