Now the growings animation looks pretty cool :)

[supertux.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index d504fa9..1fd716d 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,14 +1,22 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
-// C Implementation: timer
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
 
 #include "SDL.h"
 #include "defines.h"
@@ -32,7 +40,8 @@ void st_pause_ticks_init(void)
 
 void st_pause_ticks_start(void)
 {
-  st_pause_count = SDL_GetTicks();
+  if(st_pause_count == 0)
+    st_pause_count = SDL_GetTicks();
 }
 
 void st_pause_ticks_stop(void)
@@ -44,8 +53,21 @@ return;
   st_pause_count = 0;
 }
 
+bool st_pause_ticks_started(void)
+{
+if(st_pause_count == 0)
+return false;
+else
+return true;
+}
+
+Timer::Timer()
+{
+  init(true);
+}
+
 void
-timer_type::init(bool st_ticks)
+Timer::init(bool st_ticks)
 {
   period    = 0;
   time      = 0;
@@ -53,14 +75,14 @@ timer_type::init(bool st_ticks)
 }
 
 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 +91,7 @@ timer_type::stop()
 }
 
 int
-timer_type::check()
+Timer::check()
 {
   if((time != 0) && (time + period > get_ticks()))
     return true;
@@ -81,7 +103,7 @@ timer_type::check()
 }
 
 int
-timer_type::started()
+Timer::started()
 {
   if(time != 0)
     return true;
@@ -90,19 +112,19 @@ timer_type::started()
 }
 
 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 +143,7 @@ timer_type::fwrite(FILE* fi)
 }
 
 void
-timer_type::fread(FILE* fi)
+Timer::fread(FILE* fi)
 {
   unsigned int diff_ticks;
   int tick_mode;