Changes from August-November 2006 -- detailed history was lost.

[vor.git] / globals.h

diff --git a/globals.h b/globals.h
index 0ac8a5d..7f47314 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -3,7 +3,7 @@
 
 #include <SDL.h>
 #include <inttypes.h>
-#include "SFont.h"
+#include "font.h"
 
 struct bangdots {
        // Bang dots have the same colour as shield dots.
@@ -38,7 +38,7 @@ extern SDL_Surface
        *surf_rock[NROCKS],     // THE ROCKS
        *surf_font_big; // The big font
 
-extern SFont_Font *g_font;
+extern font *g_font;
 
 // Structure global variables
 extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
@@ -50,11 +50,8 @@ extern char *initerror;
 
 extern float screendx, screendy;
 
-// 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;