diff options
author | Rob Purchase <shotofadds@rockbox.org> | 2008-05-27 20:11:53 +0000 |
---|---|---|
committer | Rob Purchase <shotofadds@rockbox.org> | 2008-05-27 20:11:53 +0000 |
commit | b57b779fbced4a3fc1ecd0799a7666c2f1645f17 (patch) | |
tree | 46207bf001abbbe2a6b711b661b5db1e6820e9a4 /apps/plugins/zxbox/spscr.c | |
parent | ae4b677736032176459f7adbb65c5386cfc089fb (diff) | |
download | rockbox-b57b779fbced4a3fc1ecd0799a7666c2f1645f17.tar.gz rockbox-b57b779fbced4a3fc1ecd0799a7666c2f1645f17.zip |
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
Diffstat (limited to 'apps/plugins/zxbox/spscr.c')
-rw-r--r-- | apps/plugins/zxbox/spscr.c | 55 |
1 files changed, 0 insertions, 55 deletions
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 @@ | |||
28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
29 | #include <stdio.h> | 29 | #include <stdio.h> |
30 | 30 | ||
31 | int color_type = 0; | ||
32 | |||
33 | #define N0 0x04 | ||
34 | #define N1 0x34 | ||
35 | |||
36 | #define B0 0x08 | ||
37 | #define B1 0x3F | ||
38 | |||
39 | |||
40 | struct rgb *spscr_crgb; | ||
41 | |||
42 | static struct rgb norm_colors[COLORNUM]={ | ||
43 | {0,0,0},{N0,N0,N1},{N1,N0,N0},{N1,N0,N1}, | ||
44 | {N0,N1,N0},{N0,N1,N1},{N1,N1,N0},{N1,N1,N1}, | ||
45 | |||
46 | {0x15,0x15,0x15},{B0,B0,B1},{B1,B0,B0},{B1,B0,B1}, | ||
47 | {B0,B1,B0},{B0,B1,B1},{B1,B1,B0},{B1,B1,B1} | ||
48 | }; | ||
49 | |||
50 | static struct rgb gray_colors[COLORNUM]={ | ||
51 | {0,0,0},{20,20,20},{26,26,26},{32,32,32}, | ||
52 | {38,38,38},{44,44,44},{50,50,50},{56,56,56}, | ||
53 | |||
54 | {16,16,16},{23,23,23},{30,30,30},{36,36,36}, | ||
55 | {43,43,43},{50,50,50},{56,56,56},{63,63,63} | ||
56 | }; | ||
57 | |||
58 | struct rgb custom_colors[COLORNUM]={ | ||
59 | {0,0,0},{N0,N0,N1},{N1,N0,N0},{N1,N0,N1}, | ||
60 | {N0,N1,N0},{N0,N1,N1},{N1,N1,N0},{N1,N1,N1}, | ||
61 | |||
62 | {0x15,0x15,0x15},{B0,B0,B1},{B1,B0,B0},{B1,B0,B1}, | ||
63 | {B0,B1,B0},{B0,B1,B1},{B1,B1,B0},{B1,B1,B1} | ||
64 | }; | ||
65 | |||
66 | |||
67 | #define TABOFFS 2 | 31 | #define TABOFFS 2 |
68 | 32 | ||
69 | volatile int screen_visible = 1; | 33 | volatile int screen_visible = 1; |
@@ -240,22 +204,3 @@ void spscr_init_line_pointers(int lines) | |||
240 | } | 204 | } |
241 | } | 205 | } |
242 | } | 206 | } |
243 | |||
244 | void spscr_init_colors(void) | ||
245 | { | ||
246 | spscr_crgb = norm_colors; | ||
247 | |||
248 | switch(color_type) { | ||
249 | case 0: | ||
250 | spscr_crgb = norm_colors; | ||
251 | break; | ||
252 | |||
253 | case 1: | ||
254 | spscr_crgb = gray_colors; | ||
255 | break; | ||
256 | |||
257 | case 2: | ||
258 | spscr_crgb = custom_colors; | ||
259 | break; | ||
260 | } | ||
261 | } | ||