Finally!!

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index e8419f5..cab9307 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -16,7 +16,14 @@
 std::string datadir;
 
 SDL_Surface * screen;
-text_type black_text, gold_text, blue_text, red_text, yellow_nums, white_text, white_small_text, white_big_text;
+Text* black_text;
+Text* gold_text;
+Text* blue_text;
+Text* red_text;
+Text* yellow_nums;
+Text* white_text;
+Text* white_small_text;
+Text* white_big_text;
 
 MouseCursor * mouse_cursor;
 
@@ -39,8 +46,8 @@ SDL_Joystick * js;
 int wait_for_event(SDL_Event& event,unsigned int min_delay, unsigned int max_delay, bool empty_events)
 {
   int i;
-  timer_type maxdelay;
-  timer_type mindelay;
+  Timer maxdelay;
+  Timer mindelay;
   
   maxdelay.init(false);
   mindelay.init(false);