devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Doom can't use the user timer at the same time as using the grayscale lib.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9459 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2006-04-03 17:00:56 +00:00
parent ee80e003b3
commit 9f4898a3f2
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/doom/i_system.c
View file

@ -16,7 +16,10 @@
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// $Log$ // $Log$
// Revision 1.3 2006/04/02 12:45:29 amiconn // Revision 1.4 2006/04/03 17:00:56 dave
// Doom can't use the user timer at the same time as using the grayscale lib.
//
// Revision 1.3 2006-04-02 12:45:29 amiconn
// Use TIMER_FREQ for timers in plugins. Fixes timer speed on iPod. // Use TIMER_FREQ for timers in plugins. Fixes timer speed on iPod.
// //
// Revision 1.2 2006-04-02 01:52:44 kkurbjun // Revision 1.2 2006-04-02 01:52:44 kkurbjun
@ -50,7 +53,7 @@
// I_GetTime // I_GetTime
// returns time in 1/35th second tics // returns time in 1/35th second tics
// //
#if (CONFIG_CPU != PP5020) #if (CONFIG_CPU != PP5020) && !defined(HAVE_LCD_COLOR)
volatile unsigned int doomtimer=0; volatile unsigned int doomtimer=0;
void doomtime(void) void doomtime(void)
@ -61,7 +64,7 @@ void doomtime(void)
int I_GetTime (void) int I_GetTime (void)
{ {
#ifdef SIMULATOR #if defined(SIMULATOR) || !defined (HAVE_LCD_COLOR)
#if HZ==100 #if HZ==100
return ((7*(*rb->current_tick))/20); return ((7*(*rb->current_tick))/20);
#else #else
@ -86,7 +89,7 @@ int I_GetTime (void)
// The game is much slower now (in terms of game speed). // The game is much slower now (in terms of game speed).
void I_Init (void) void I_Init (void)
{ {
#if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) #if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) && defined(HAVE_LCD_COLOR)
rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime); rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime);
#endif #endif
I_InitSound(); I_InitSound();