From b57b779fbced4a3fc1ecd0799a7666c2f1645f17 Mon Sep 17 00:00:00 2001 From: Rob Purchase Date: Tue, 27 May 2008 20:11:53 +0000 Subject: Tweak ZXBox colours: 1) 'Bright' black is the same as normal black on a real Spectrum, so make it so here too. 2) Use more accurate RGB values in the 16bpp driver (taken from the FUSE emulator). 3) Remove some confusing duplicate definitions. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17638 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/zxbox/spscr.c | 55 ---------------------------------------------- 1 file changed, 55 deletions(-) (limited to 'apps/plugins/zxbox/spscr.c') diff --git a/apps/plugins/zxbox/spscr.c b/apps/plugins/zxbox/spscr.c index 2693812bf6..2c24fb37a8 100644 --- a/apps/plugins/zxbox/spscr.c +++ b/apps/plugins/zxbox/spscr.c @@ -28,42 +28,6 @@ #include #include -int color_type = 0; - -#define N0 0x04 -#define N1 0x34 - -#define B0 0x08 -#define B1 0x3F - - -struct rgb *spscr_crgb; - -static struct rgb norm_colors[COLORNUM]={ - {0,0,0},{N0,N0,N1},{N1,N0,N0},{N1,N0,N1}, - {N0,N1,N0},{N0,N1,N1},{N1,N1,N0},{N1,N1,N1}, - - {0x15,0x15,0x15},{B0,B0,B1},{B1,B0,B0},{B1,B0,B1}, - {B0,B1,B0},{B0,B1,B1},{B1,B1,B0},{B1,B1,B1} -}; - -static struct rgb gray_colors[COLORNUM]={ - {0,0,0},{20,20,20},{26,26,26},{32,32,32}, - {38,38,38},{44,44,44},{50,50,50},{56,56,56}, - - {16,16,16},{23,23,23},{30,30,30},{36,36,36}, - {43,43,43},{50,50,50},{56,56,56},{63,63,63} -}; - -struct rgb custom_colors[COLORNUM]={ - {0,0,0},{N0,N0,N1},{N1,N0,N0},{N1,N0,N1}, - {N0,N1,N0},{N0,N1,N1},{N1,N1,N0},{N1,N1,N1}, - - {0x15,0x15,0x15},{B0,B0,B1},{B1,B0,B0},{B1,B0,B1}, - {B0,B1,B0},{B0,B1,B1},{B1,B1,B0},{B1,B1,B1} -}; - - #define TABOFFS 2 volatile int screen_visible = 1; @@ -240,22 +204,3 @@ void spscr_init_line_pointers(int lines) } } } - -void spscr_init_colors(void) -{ - spscr_crgb = norm_colors; - - switch(color_type) { - case 0: - spscr_crgb = norm_colors; - break; - - case 1: - spscr_crgb = gray_colors; - break; - - case 2: - spscr_crgb = custom_colors; - break; - } -} -- cgit v1.2.3