- just doing some C++ifying

[supertux.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index d9d82cd..5a68fc8 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -24,7 +24,7 @@
 
 #include <string>
 #include <SDL.h>
-#include "text.h"
+#include "screen/font.h"
 #include "menu.h"
 #include "mousecursor.h"
 
@@ -46,15 +46,13 @@ struct JoystickKeymap
 
 extern JoystickKeymap joystick_keymap;
 
-extern SDL_Surface * screen;
-extern Text* black_text;
-extern Text* gold_text;
-extern Text* white_text;
-extern Text* white_small_text;
-extern Text* white_big_text;
-extern Text* blue_text;
-extern Text* red_text;
-extern Text* yellow_nums;
+extern SDL_Surface* screen;
+extern Font* gold_text;
+extern Font* white_text;
+extern Font* white_small_text;
+extern Font* white_big_text;
+extern Font* blue_text;
+extern Font* yellow_nums;
 
 extern MouseCursor * mouse_cursor;
 
@@ -67,7 +65,7 @@ extern bool show_fps;
 /** The number of the joystick that will be use in the game */
 extern int joystick_num;
 extern char* level_startup_file;
-extern bool launch_worldmap_mode;
+extern bool launch_leveleditor_mode;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 extern char* st_dir;