Finally!!

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index fc4bc61..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,16 +46,17 @@ 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_init(&maxdelay,false);
-  timer_init(&mindelay,false);
+  Timer maxdelay;
+  Timer mindelay;
+  
+  maxdelay.init(false);
+  mindelay.init(false);
 
   if(max_delay < min_delay)
     max_delay = min_delay;
 
-  timer_start(&maxdelay,max_delay);
-  timer_start(&mindelay,min_delay);
+  maxdelay.start(max_delay);
+  mindelay.start(min_delay);
 
   if(empty_events)
     while (SDL_PollEvent(&event))
@@ -56,11 +64,11 @@ int wait_for_event(SDL_Event& event,unsigned int min_delay, unsigned int max_del
 
   /* Handle events: */
 
-  for(i = 0; timer_check(&maxdelay) || !i; ++i)
+  for(i = 0; maxdelay.check() || !i; ++i)
     {
       while (SDL_PollEvent(&event))
         {
-          if(!timer_check(&mindelay))
+          if(!mindelay.check())
             {
               if (event.type == SDL_QUIT)
                 {