Previous 15994 Revisions Next

r1822 Saturday 1st March, 2008 at 22:15:03 UTC by Nathan Woods
[SPECTRUM] Fixed regressions [Miodrag Milanovic]
[src/mess/drivers]spectrum.c
[src/mess/video]spectrum.c

src/mess/video/spectrum.c
r1821r1822
216216                                            flash_invert);
217217      drawgfx(bitmap,machine->gfx[0],
218218         count,
219         color,
219         color+8, // use 2nd part of palette
220220         0,0,
221221                            (sx*8)+SPEC_LEFT_BORDER,(sy*8)+SPEC_TOP_BORDER,
222222         0,TRANSPARENCY_NONE,0);
r1821r1822
228228                                            flash_invert);
229229      drawgfx(bitmap,machine->gfx[1],
230230         count,
231         color,
231         color+8, // use 2nd part of palette
232232         0,0,
233233                            (sx*8)+SPEC_LEFT_BORDER,((sy+8)*8)+SPEC_TOP_BORDER,
234234         0,TRANSPARENCY_NONE,0);
r1821r1822
240240                                            flash_invert);
241241      drawgfx(bitmap,machine->gfx[2],
242242         count,
243         color,
243         color+8, // use 2nd part of palette
244244         0,0,
245245                            (sx*8)+SPEC_LEFT_BORDER,((sy+16)*8)+SPEC_TOP_BORDER,
246246         0,TRANSPARENCY_NONE,0);
src/mess/drivers/spectrum.c
r1821r1822
19121912
19131913INPUT_PORTS_END
19141914
1915static const unsigned char spectrum_palette[16*3] = {
1916   0x00, 0x00, 0x00, 0x00, 0x00, 0xbf,
1917   0xbf, 0x00, 0x00, 0xbf, 0x00, 0xbf,
1918   0x00, 0xbf, 0x00, 0x00, 0xbf, 0xbf,
1919   0xbf, 0xbf, 0x00, 0xbf, 0xbf, 0xbf,
1915#define ZX_COL_0   MAKE_RGB(0x00, 0x00, 0x00)
1916#define ZX_COL_1   MAKE_RGB(0x00, 0x00, 0xbf)
1917#define ZX_COL_2   MAKE_RGB(0xbf, 0x00, 0x00)
1918#define ZX_COL_3   MAKE_RGB(0xbf, 0x00, 0xbf)
1919#define ZX_COL_4   MAKE_RGB(0x00, 0xbf, 0x00)
1920#define ZX_COL_5   MAKE_RGB(0x00, 0xbf, 0xbf)
1921#define ZX_COL_6   MAKE_RGB(0xbf, 0xbf, 0x00)
1922#define ZX_COL_7   MAKE_RGB(0xbf, 0xbf, 0xbf)
1923#define ZX_COL_8   MAKE_RGB(0x00, 0x00, 0x00)
1924#define ZX_COL_9   MAKE_RGB(0x00, 0x00, 0xff)
1925#define ZX_COL_A   MAKE_RGB(0xff, 0x00, 0x00)
1926#define ZX_COL_B   MAKE_RGB(0xff, 0x00, 0xff)
1927#define ZX_COL_C   MAKE_RGB(0x00, 0xff, 0x00)
1928#define ZX_COL_D   MAKE_RGB(0x00, 0xff, 0xff)
1929#define ZX_COL_E   MAKE_RGB(0xff, 0xff, 0x00)
1930#define ZX_COL_F   MAKE_RGB(0xff, 0xff, 0xff)
19201931
1921   0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
1922   0xff, 0x00, 0x00, 0xff, 0x00, 0xff,
1923   0x00, 0xff, 0x00, 0x00, 0xff, 0xff,
1924   0xff, 0xff, 0x00, 0xff, 0xff, 0xff,
1932const rgb_t spectrum_palette[256 + 16] = {
1933   ZX_COL_0,ZX_COL_1,ZX_COL_2,ZX_COL_3,ZX_COL_4,ZX_COL_5,ZX_COL_6,ZX_COL_7,ZX_COL_8,ZX_COL_9,ZX_COL_A,ZX_COL_B,ZX_COL_C,ZX_COL_D,ZX_COL_E,ZX_COL_F,
1934   
1935   ZX_COL_0,ZX_COL_0,ZX_COL_0,ZX_COL_1,ZX_COL_0,ZX_COL_2,ZX_COL_0,ZX_COL_3,ZX_COL_0,ZX_COL_4,ZX_COL_0,ZX_COL_5,ZX_COL_0,ZX_COL_6,ZX_COL_0,ZX_COL_7,
1936   ZX_COL_1,ZX_COL_0,ZX_COL_1,ZX_COL_1,ZX_COL_1,ZX_COL_2,ZX_COL_1,ZX_COL_3,ZX_COL_1,ZX_COL_4,ZX_COL_1,ZX_COL_5,ZX_COL_1,ZX_COL_6,ZX_COL_1,ZX_COL_7,
1937   ZX_COL_2,ZX_COL_0,ZX_COL_2,ZX_COL_1,ZX_COL_2,ZX_COL_2,ZX_COL_2,ZX_COL_3,ZX_COL_2,ZX_COL_4,ZX_COL_2,ZX_COL_5,ZX_COL_2,ZX_COL_6,ZX_COL_2,ZX_COL_7,   
1938   ZX_COL_3,ZX_COL_0,ZX_COL_3,ZX_COL_1,ZX_COL_3,ZX_COL_2,ZX_COL_3,ZX_COL_3,ZX_COL_3,ZX_COL_4,ZX_COL_3,ZX_COL_5,ZX_COL_3,ZX_COL_6,ZX_COL_3,ZX_COL_7,   
1939   ZX_COL_4,ZX_COL_0,ZX_COL_4,ZX_COL_1,ZX_COL_4,ZX_COL_2,ZX_COL_4,ZX_COL_3,ZX_COL_4,ZX_COL_4,ZX_COL_4,ZX_COL_5,ZX_COL_4,ZX_COL_6,ZX_COL_4,ZX_COL_7,   
1940   ZX_COL_5,ZX_COL_0,ZX_COL_5,ZX_COL_1,ZX_COL_5,ZX_COL_2,ZX_COL_5,ZX_COL_3,ZX_COL_5,ZX_COL_4,ZX_COL_5,ZX_COL_5,ZX_COL_5,ZX_COL_6,ZX_COL_5,ZX_COL_7,
1941   ZX_COL_6,ZX_COL_0,ZX_COL_6,ZX_COL_1,ZX_COL_6,ZX_COL_2,ZX_COL_6,ZX_COL_3,ZX_COL_6,ZX_COL_4,ZX_COL_6,ZX_COL_5,ZX_COL_6,ZX_COL_6,ZX_COL_6,ZX_COL_7,
1942   ZX_COL_7,ZX_COL_0,ZX_COL_7,ZX_COL_1,ZX_COL_7,ZX_COL_2,ZX_COL_7,ZX_COL_3,ZX_COL_7,ZX_COL_4,ZX_COL_7,ZX_COL_5,ZX_COL_7,ZX_COL_6,ZX_COL_7,ZX_COL_7,   
1943   ZX_COL_8,ZX_COL_8,ZX_COL_8,ZX_COL_9,ZX_COL_8,ZX_COL_A,ZX_COL_8,ZX_COL_B,ZX_COL_8,ZX_COL_C,ZX_COL_8,ZX_COL_D,ZX_COL_8,ZX_COL_E,ZX_COL_8,ZX_COL_F,
1944   ZX_COL_9,ZX_COL_8,ZX_COL_9,ZX_COL_9,ZX_COL_9,ZX_COL_A,ZX_COL_9,ZX_COL_B,ZX_COL_9,ZX_COL_C,ZX_COL_9,ZX_COL_D,ZX_COL_9,ZX_COL_E,ZX_COL_9,ZX_COL_F,
1945   ZX_COL_A,ZX_COL_8,ZX_COL_A,ZX_COL_9,ZX_COL_A,ZX_COL_A,ZX_COL_A,ZX_COL_B,ZX_COL_A,ZX_COL_C,ZX_COL_A,ZX_COL_D,ZX_COL_A,ZX_COL_E,ZX_COL_A,ZX_COL_F,   
1946   ZX_COL_B,ZX_COL_8,ZX_COL_B,ZX_COL_9,ZX_COL_B,ZX_COL_A,ZX_COL_B,ZX_COL_B,ZX_COL_B,ZX_COL_C,ZX_COL_B,ZX_COL_D,ZX_COL_B,ZX_COL_E,ZX_COL_B,ZX_COL_F,   
1947   ZX_COL_C,ZX_COL_8,ZX_COL_C,ZX_COL_9,ZX_COL_C,ZX_COL_A,ZX_COL_C,ZX_COL_B,ZX_COL_C,ZX_COL_C,ZX_COL_C,ZX_COL_D,ZX_COL_C,ZX_COL_E,ZX_COL_C,ZX_COL_F,   
1948   ZX_COL_D,ZX_COL_8,ZX_COL_D,ZX_COL_9,ZX_COL_D,ZX_COL_A,ZX_COL_D,ZX_COL_B,ZX_COL_D,ZX_COL_C,ZX_COL_D,ZX_COL_D,ZX_COL_D,ZX_COL_E,ZX_COL_D,ZX_COL_F,
1949   ZX_COL_E,ZX_COL_8,ZX_COL_E,ZX_COL_9,ZX_COL_E,ZX_COL_A,ZX_COL_E,ZX_COL_B,ZX_COL_E,ZX_COL_C,ZX_COL_E,ZX_COL_D,ZX_COL_E,ZX_COL_E,ZX_COL_E,ZX_COL_F,
1950   ZX_COL_F,ZX_COL_8,ZX_COL_F,ZX_COL_9,ZX_COL_F,ZX_COL_A,ZX_COL_F,ZX_COL_B,ZX_COL_F,ZX_COL_C,ZX_COL_F,ZX_COL_D,ZX_COL_F,ZX_COL_E,ZX_COL_F,ZX_COL_F
1951   };
1952
1953const rgb_t spectrum_128_palette[16] = {
1954   ZX_COL_0,ZX_COL_1,ZX_COL_2,ZX_COL_3,ZX_COL_4,ZX_COL_5,ZX_COL_6,ZX_COL_7,ZX_COL_8,ZX_COL_9,ZX_COL_A,ZX_COL_B,ZX_COL_C,ZX_COL_D,ZX_COL_E,ZX_COL_F
19251955};
19261956
1927static const unsigned short spectrum_colortable[128*2] = {
1928   0,0, 0,1, 0,2, 0,3, 0,4, 0,5, 0,6, 0,7,
1929   1,0, 1,1, 1,2, 1,3, 1,4, 1,5, 1,6, 1,7,
1930   2,0, 2,1, 2,2, 2,3, 2,4, 2,5, 2,6, 2,7,
1931   3,0, 3,1, 3,2, 3,3, 3,4, 3,5, 3,6, 3,7,
1932   4,0, 4,1, 4,2, 4,3, 4,4, 4,5, 4,6, 4,7,
1933   5,0, 5,1, 5,2, 5,3, 5,4, 5,5, 5,6, 5,7,
1934   6,0, 6,1, 6,2, 6,3, 6,4, 6,5, 6,6, 6,7,
1935   7,0, 7,1, 7,2, 7,3, 7,4, 7,5, 7,6, 7,7,
1936
1937    8,8,  8,9,  8,10,   8,11,  8,12,  8,13,  8,14,   8,15,
1938    9,8,  9,9,  9,10,   9,11,  9,12,  9,13,  9,14,   9,15,
1939   10,8, 10,9, 10,10, 10,11, 10,12, 10,13, 10,14, 10,15,
1940   11,8, 11,9, 11,10, 11,11, 11,12, 11,13, 11,14, 11,15,
1941   12,8, 12,9, 12,10, 12,11, 12,12, 12,13, 12,14, 12,15,
1942   13,8, 13,9, 13,10, 13,11, 13,12, 13,13, 13,14, 13,15,
1943   14,8, 14,9, 14,10, 14,11, 14,12, 14,13, 14,14, 14,15,
1944   15,8, 15,9, 15,10, 15,11, 15,12, 15,13, 15,14, 15,15
1945};
19461957/* Initialise the palette */
19471958static PALETTE_INIT( spectrum )
19481959{
1949   palette_set_colors_rgb(machine, 0, spectrum_palette, sizeof(spectrum_palette) / 3);
1960   palette_set_colors(machine, 0, spectrum_palette, ARRAY_LENGTH(spectrum_palette));
19501961}
19511962
1963static PALETTE_INIT( spectrum_128 )
1964{   
1965   palette_set_colors(machine, 0, spectrum_128_palette, ARRAY_LENGTH(spectrum_128_palette));
1966}
1967
19521968static INTERRUPT_GEN( spec_interrupt )
19531969{
19541970   cpunum_set_input_line(machine, 0, 0, HOLD_LINE);
r1821r1822
19741990   MDRV_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
19751991   MDRV_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
19761992   MDRV_GFXDECODE( spectrum )
1977   MDRV_PALETTE_LENGTH(16)
1993   MDRV_PALETTE_LENGTH(256 + 16)
19781994   MDRV_PALETTE_INIT( spectrum )
19791995
19801996   MDRV_VIDEO_START( spectrum )
r1821r1822
20012017
20022018    /* video hardware */
20032019   MDRV_SCREEN_MODIFY("main")
2020   MDRV_PALETTE_LENGTH(16)
2021   MDRV_PALETTE_INIT( spectrum_128 )
20042022   MDRV_SCREEN_REFRESH_RATE(50.021)
20052023   MDRV_VIDEO_START( spectrum_128 )
20062024   MDRV_VIDEO_UPDATE( spectrum_128 )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team