[Super-tux-commit] supertux/src badguy.h,1.22,1.23 button.cpp,1.11,1.12 button.h,1.12,1.13 gameloop.h,1.37,1.38 gameobjs.h,1.4,1.5 globals.cpp,1.9,1.10 intro.cpp,1.12,1.13 leveleditor.cpp,1.39,1.40 menu.h,1.27,1.28 mousecursor.h,1.2,1.3 player.h,1.23,1.24 timer.cpp,1.8,1.9 timer.h,1.10,1.11 title.cpp,1.33,1.34

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12680

Modified Files:
	badguy.h button.cpp button.h gameloop.h gameobjs.h globals.cpp 
	intro.cpp leveleditor.cpp menu.h mousecursor.h player.h 
	timer.cpp timer.h title.cpp 
Log Message:
renamed timer_type to Timer

Index: mousecursor.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/mousecursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mousecursor.h	28 Mar 2004 01:00:16 -0000	1.2
+++ mousecursor.h	11 Apr 2004 16:38:58 -0000	1.3
@@ -40,7 +40,7 @@
     int cur_state;
     int cur_frame, tot_frames;
     texture_type cursor;
-    timer_type timer;
+    Timer timer;
   };
 
 #endif /*SUPERTUX_MOUSECURSOR_H*/

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- player.h	11 Apr 2004 15:28:26 -0000	1.23
+++ player.h	11 Apr 2004 16:38:58 -0000	1.24
@@ -111,10 +111,10 @@
   base_type  base;
   base_type  old_base;
   base_type  previous_base;
-  timer_type invincible_timer;
-  timer_type skidding_timer;
-  timer_type safe_timer;
-  timer_type frame_timer;
+  Timer invincible_timer;
+  Timer skidding_timer;
+  Timer safe_timer;
+  Timer frame_timer;
   Physic physic;
 
  public:

Index: timer.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/timer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- timer.h	11 Apr 2004 16:33:11 -0000	1.10
+++ timer.h	11 Apr 2004 16:38:58 -0000	1.11
@@ -20,7 +20,7 @@
 void st_pause_ticks_start(void);
 void st_pause_ticks_stop(void);
 
-class timer_type
+class Timer
 {
  public:
   unsigned int period;
@@ -33,9 +33,6 @@
   void stop();
 
   /*======================================================================
-    int timer_check(timer_type* ptimer);
-    
-    param : pointer to a timer which needs to be checked
     return: NO  = the timer is not started
     or it is over
     YES = otherwise
@@ -44,9 +41,6 @@
   int started();
 
   /*======================================================================
-    int timer_get_left(timer_type* ptimer);
-
-    param : pointer to a timer that you want to get the time left
     return: the time left (in millisecond)
     note  : the returned value can be negative
     ======================================================================*/

Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- intro.cpp	11 Apr 2004 16:33:11 -0000	1.12
+++ intro.cpp	11 Apr 2004 16:38:58 -0000	1.13
@@ -48,7 +48,7 @@
   SDL_Rect src, dest;
   int done, i, quit, j, scene;
   int * height, * height_speed;
-  timer_type timer;
+  Timer timer;
 
   /* Load sprite images: */
   texture_load(&bkgd, datadir + "/images/intro/intro.png", IGNORE_ALPHA);

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- leveleditor.cpp	11 Apr 2004 16:33:11 -0000	1.39
+++ leveleditor.cpp	11 Apr 2004 16:38:58 -0000	1.40
@@ -111,7 +111,7 @@
 static Menu* subset_settings_menu;
 static Menu* level_settings_menu;
 static Menu* select_tilegroup_menu;
-static timer_type select_tilegroup_menu_effect;
+static Timer select_tilegroup_menu_effect;
 static std::map<std::string, ButtonPanel* > tilegroups_map;
 static std::string cur_tilegroup;
 

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gameobjs.h	11 Apr 2004 15:28:26 -0000	1.4
+++ gameobjs.h	11 Apr 2004 16:38:58 -0000	1.5
@@ -50,7 +50,7 @@
 {
  public:
   base_type base;
-  timer_type timer;
+  Timer timer;
   Tile* tile;
 
   void init(Tile* tile, float x, float y, float xm, float ym);
@@ -75,7 +75,7 @@
 {
  public:
   int value;
-  timer_type timer;
+  Timer timer;
   base_type base;
   
   void init(float x, float y, int s);

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- button.cpp	11 Apr 2004 16:23:07 -0000	1.11
+++ button.cpp	11 Apr 2004 16:38:58 -0000	1.12
@@ -17,7 +17,7 @@
 #include "globals.h"
 #include "button.h"
 
-timer_type Button::popup_timer;
+Timer Button::popup_timer;
 
 Button::Button(std::string icon_file, std::string ninfo, SDLKey nshortcut, int x, int y, int mw, int mh)
 {

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- badguy.h	11 Apr 2004 15:28:26 -0000	1.22
+++ badguy.h	11 Apr 2004 16:38:58 -0000	1.23
@@ -96,7 +96,7 @@
 private:
   bool seen;
   base_type old_base;
-  timer_type timer;
+  Timer timer;
   Physic physic;
 
   texture_type* texture_left;

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- menu.h	10 Apr 2004 18:56:17 -0000	1.27
+++ menu.h	11 Apr 2004 16:38:58 -0000	1.28
@@ -65,7 +65,7 @@
   int height();
   
 public:
-  timer_type effect;
+  Timer effect;
   int arrange_left;
   int active_item;
   menu_item_type *item;

Index: globals.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/globals.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- globals.cpp	11 Apr 2004 16:23:07 -0000	1.9
+++ globals.cpp	11 Apr 2004 16:38:58 -0000	1.10
@@ -39,8 +39,8 @@
 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);

Index: timer.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/timer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- timer.cpp	11 Apr 2004 16:33:11 -0000	1.8
+++ timer.cpp	11 Apr 2004 16:38:58 -0000	1.9
@@ -45,7 +45,7 @@
 }
 
 void
-timer_type::init(bool st_ticks)
+Timer::init(bool st_ticks)
 {
   period    = 0;
   time      = 0;
@@ -53,14 +53,14 @@
 }
 
 void
-timer_type::start(unsigned int period_)
+Timer::start(unsigned int period_)
 {
   time   = get_ticks();
   period = period_;
 }
 
 void
-timer_type::stop()
+Timer::stop()
 {
   if(get_ticks == st_get_ticks)
     init(true);
@@ -69,7 +69,7 @@
 }
 
 int
-timer_type::check()
+Timer::check()
 {
   if((time != 0) && (time + period > get_ticks()))
     return true;
@@ -81,7 +81,7 @@
 }
 
 int
-timer_type::started()
+Timer::started()
 {
   if(time != 0)
     return true;
@@ -90,19 +90,19 @@
 }
 
 int
-timer_type::get_left()
+Timer::get_left()
 {
   return (period - (get_ticks() - time));
 }
 
 int
-timer_type::get_gone()
+Timer::get_gone()
 {
   return (get_ticks() - time);
 }
 
 void
-timer_type::fwrite(FILE* fi)
+Timer::fwrite(FILE* fi)
 {
   unsigned int diff_ticks;
   int tick_mode;
@@ -121,7 +121,7 @@
 }
 
 void
-timer_type::fread(FILE* fi)
+Timer::fread(FILE* fi)
 {
   unsigned int diff_ticks;
   int tick_mode;

Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gameloop.h	11 Apr 2004 15:33:53 -0000	1.37
+++ gameloop.h	11 Apr 2004 16:38:58 -0000	1.38
@@ -36,8 +36,8 @@
 {
  private:
   bool quit;
-  timer_type fps_timer;
-  timer_type frame_timer;
+  Timer fps_timer;
+  Timer frame_timer;
   World* world;
   int st_gl_mode;
 
@@ -53,7 +53,7 @@
   int levelnb;
 
  public:
-  timer_type time_left;
+  Timer time_left;
 
   GameSession();
   GameSession(const std::string& filename);

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- title.cpp	11 Apr 2004 16:33:11 -0000	1.33
+++ title.cpp	11 Apr 2004 16:38:58 -0000	1.34
@@ -46,7 +46,7 @@
 static texture_type img_choose_subset;
 
 static bool walking;
-static timer_type random_timer;
+static Timer random_timer;
 
 static SDL_Event event;
 static SDLKey key;
@@ -389,7 +389,7 @@
 {
   int done;
   int scroll, speed;
-  timer_type timer;
+  Timer timer;
   int n,d;
   int length;
   FILE* fi;

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- button.h	4 Apr 2004 00:32:10 -0000	1.12
+++ button.h	11 Apr 2004 16:38:58 -0000	1.13
@@ -42,7 +42,7 @@
     }
 
   private:
-    static timer_type popup_timer;
+    static Timer popup_timer;
     texture_type icon;
     texture_type* bkgd;
     std::string info;