From 546d96c46fb5b6fc8b2185d73b40fc958ee43709 Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Sun, 2 Apr 2006 20:45:24 +0000 Subject: Properly ifdef H300 video code, fix commented line handling rockbox volume git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9439 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/i_video.c | 12 ++++++++---- apps/plugins/doom/rockdoom.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'apps/plugins/doom') diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index b7dbd2bcf5..6adb9491a4 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -16,7 +16,10 @@ * GNU General Public License for more details. * * $Log$ - * Revision 1.3 2006/04/02 01:52:44 kkurbjun + * Revision 1.4 2006/04/02 20:45:24 kkurbjun + * Properly ifdef H300 video code, fix commented line handling rockbox volume + * + * Revision 1.3 2006-04-02 01:52:44 kkurbjun * Update adds prboom's high resolution support, also makes the scaling for platforms w/ resolution less then 320x200 much nicer. IDoom's lookup table code has been removed. Also fixed a pallete bug. Some graphic errors are present in menu and status bar. Also updates some headers and output formatting. * * Revision 1.2 2006-03-28 17:20:49 christian @@ -322,9 +325,10 @@ void I_UpdateNoBlit (void) void I_FinishUpdate (void) { -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(IRIVER_H300_SERIES) && !defined(SIMULATOR) /* - Lookup tables are no longer needed + Lookup tables are no longer needed (H300 specific, decreases timedemo + by about 500 tics) */ // Start the write @@ -391,7 +395,7 @@ void I_InitGraphics(void) printf("Starting Graphics engine\n"); - /* Note: The other screens are initialized later */ + /* Note: The other screens are allocated as needed */ #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index ae5ea39a66..1810acdff5 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c @@ -666,7 +666,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_clear_display(); -// systemvol= rb->global_settings->volume-rb->global_settings->volume%((rb->sound_max(SOUND_VOLUME)-rb->sound_min(SOUND_VOLUME))/15); + systemvol= rb->global_settings->volume-rb->global_settings->volume%((rb->sound_max(SOUND_VOLUME)-rb->sound_min(SOUND_VOLUME))/15); general_translucency = default_translucency; // phares D_DoomMain (); -- cgit v1.2.3