From 7d561182ae7bbf4d8d2d82f9db6ba0d2b867a4ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Gl=C3=A4=C3=9Fer?= Date: Tue, 20 Jul 2004 17:53:43 +0000 Subject: [PATCH] removed in favor of the new library SVN-Revision: 1593 --- src/timer.cpp | 168 ---------------------------------------------------------- src/timer.h | 69 ------------------------ 2 files changed, 237 deletions(-) delete mode 100644 src/timer.cpp delete mode 100644 src/timer.h diff --git a/src/timer.cpp b/src/timer.cpp deleted file mode 100644 index f316fa577..000000000 --- a/src/timer.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// $Id$ -// -// SuperTux -// Copyright (C) 2004 Tobias Glaesser -// -// 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" -#include "timer.h" - -unsigned int st_pause_ticks, st_pause_count; - -unsigned int st_get_ticks(void) -{ - if(st_pause_count != 0) - return /*SDL_GetTicks()*/ - st_pause_ticks /*- SDL_GetTicks()*/ + st_pause_count; - else - return SDL_GetTicks() - st_pause_ticks; -} - -void st_pause_ticks_init(void) -{ - st_pause_ticks = 0; - st_pause_count = 0; -} - -void st_pause_ticks_start(void) -{ - if(st_pause_count == 0) - st_pause_count = SDL_GetTicks(); -} - -void st_pause_ticks_stop(void) -{ -if(st_pause_count == 0) -return; - - st_pause_ticks += SDL_GetTicks() - st_pause_count; - 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::init(bool st_ticks) -{ - period = 0; - time = 0; - get_ticks = st_ticks ? st_get_ticks : SDL_GetTicks; -} - -void -Timer::start(unsigned int period_) -{ - time = get_ticks(); - period = period_; -} - -void -Timer::stop() -{ - if(get_ticks == st_get_ticks) - init(true); - else - init(false); -} - -int -Timer::check() -{ - if((time != 0) && (time + period > get_ticks())) - return true; - else - { - time = 0; - return false; - } -} - -int -Timer::started() -{ - if(time != 0) - return true; - else - return false; -} - -int -Timer::get_left() -{ - return (period - (get_ticks() - time)); -} - -int -Timer::get_gone() -{ - return (get_ticks() - time); -} - -void -Timer::fwrite(FILE* fi) -{ - unsigned int diff_ticks; - int tick_mode; - if(time != 0) - diff_ticks = get_ticks() - time; - else - diff_ticks = 0; - - ::fwrite(&period,sizeof(unsigned int),1,fi); - ::fwrite(&diff_ticks,sizeof(unsigned int),1,fi); - if(get_ticks == st_get_ticks) - tick_mode = true; - else - tick_mode = false; - ::fwrite(&tick_mode,sizeof(unsigned int),1,fi); -} - -void -Timer::fread(FILE* fi) -{ - unsigned int diff_ticks; - int tick_mode; - - ::fread(&period,sizeof(unsigned int),1,fi); - ::fread(&diff_ticks,sizeof(unsigned int),1,fi); - ::fread(&tick_mode,sizeof(unsigned int),1,fi); - - if (tick_mode) - get_ticks = st_get_ticks; - else - get_ticks = SDL_GetTicks; - - if (diff_ticks != 0) - time = get_ticks() - diff_ticks; - else - time = 0; - -} - -/* EOF */ diff --git a/src/timer.h b/src/timer.h deleted file mode 100644 index 734c896a0..000000000 --- a/src/timer.h +++ /dev/null @@ -1,69 +0,0 @@ -// $Id$ -// -// SuperTux -// Copyright (C) 2004 Tobias Glaesser -// -// 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. - -#ifndef SUPERTUX_TIMER_H -#define SUPERTUX_TIMER_H - -extern unsigned int st_pause_ticks, st_pause_count; - -unsigned int st_get_ticks(void); -void st_pause_ticks_init(void); -void st_pause_ticks_start(void); -void st_pause_ticks_stop(void); -bool st_pause_ticks_started(void); - -class Timer -{ - public: - unsigned int period; - unsigned int time; - unsigned int (*get_ticks) (void); - - public: - Timer(); - - void init(bool st_ticks); - void start(unsigned int period); - void stop(); - - /*====================================================================== - return: NO = the timer is not started - or it is over - YES = otherwise - ======================================================================*/ - int check(); - int started(); - - /*====================================================================== - return: the time left (in millisecond) - note : the returned value can be negative - ======================================================================*/ - int get_left(); - - int get_gone(); - void fwrite(FILE* fi); - void fread(FILE* fi); -}; - -#endif /*SUPERTUX_TIMER_H*/ - -/* Local Variables: */ -/* mode:c++ */ -/* End: */ -- 2.11.0