diff options
author | Dave Chapman <dave@dchapman.com> | 2006-04-03 17:00:56 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-04-03 17:00:56 +0000 |
commit | 9f4898a3f2f67c8b3323c8a1829f74087ac22eb9 (patch) | |
tree | 7f2759cb56952342f82dfe3f7cd233500da8c58a /apps/plugins/doom | |
parent | ee80e003b39d532326267e8539032b3e3e76d948 (diff) | |
download | rockbox-9f4898a3f2f67c8b3323c8a1829f74087ac22eb9.tar.gz rockbox-9f4898a3f2f67c8b3323c8a1829f74087ac22eb9.zip |
Doom can't use the user timer at the same time as using the grayscale lib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9459 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/i_system.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/plugins/doom/i_system.c b/apps/plugins/doom/i_system.c index 8a53f21b9f..d21777361b 100644 --- a/apps/plugins/doom/i_system.c +++ b/apps/plugins/doom/i_system.c | |||
@@ -16,7 +16,10 @@ | |||
16 | // GNU General Public License for more details. | 16 | // GNU General Public License for more details. |
17 | // | 17 | // |
18 | // $Log$ | 18 | // $Log$ |
19 | // Revision 1.3 2006/04/02 12:45:29 amiconn | 19 | // Revision 1.4 2006/04/03 17:00:56 dave |
20 | // Doom can't use the user timer at the same time as using the grayscale lib. | ||
21 | // | ||
22 | // Revision 1.3 2006-04-02 12:45:29 amiconn | ||
20 | // Use TIMER_FREQ for timers in plugins. Fixes timer speed on iPod. | 23 | // Use TIMER_FREQ for timers in plugins. Fixes timer speed on iPod. |
21 | // | 24 | // |
22 | // Revision 1.2 2006-04-02 01:52:44 kkurbjun | 25 | // Revision 1.2 2006-04-02 01:52:44 kkurbjun |
@@ -50,7 +53,7 @@ | |||
50 | // I_GetTime | 53 | // I_GetTime |
51 | // returns time in 1/35th second tics | 54 | // returns time in 1/35th second tics |
52 | // | 55 | // |
53 | #if (CONFIG_CPU != PP5020) | 56 | #if (CONFIG_CPU != PP5020) && !defined(HAVE_LCD_COLOR) |
54 | volatile unsigned int doomtimer=0; | 57 | volatile unsigned int doomtimer=0; |
55 | 58 | ||
56 | void doomtime(void) | 59 | void doomtime(void) |
@@ -61,7 +64,7 @@ void doomtime(void) | |||
61 | 64 | ||
62 | int I_GetTime (void) | 65 | int I_GetTime (void) |
63 | { | 66 | { |
64 | #ifdef SIMULATOR | 67 | #if defined(SIMULATOR) || !defined (HAVE_LCD_COLOR) |
65 | #if HZ==100 | 68 | #if HZ==100 |
66 | return ((7*(*rb->current_tick))/20); | 69 | return ((7*(*rb->current_tick))/20); |
67 | #else | 70 | #else |
@@ -86,7 +89,7 @@ int I_GetTime (void) | |||
86 | // The game is much slower now (in terms of game speed). | 89 | // The game is much slower now (in terms of game speed). |
87 | void I_Init (void) | 90 | void I_Init (void) |
88 | { | 91 | { |
89 | #if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) | 92 | #if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) && defined(HAVE_LCD_COLOR) |
90 | rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime); | 93 | rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime); |
91 | #endif | 94 | #endif |
92 | I_InitSound(); | 95 | I_InitSound(); |