diff options
author | Zsolt Vasvari <zsoltvas@mamedev.org> | 2008-02-03 03:43:42 +0000 |
---|---|---|
committer | Zsolt Vasvari <zsoltvas@mamedev.org> | 2008-02-03 03:43:42 +0000 |
commit | c4197196facb3611940dc7415b41ba981226ed39 (patch) | |
tree | 2e0fd629d791ba164d05743fddae95a4a1c57f44 | |
parent | a8747fd096d097c04e8cfd8efd4b43bbb8230c84 (diff) |
Color table removal
-rw-r--r-- | src/mame/drivers/cham24.c | 1 | ||||
-rw-r--r-- | src/mame/drivers/multigam.c | 1 | ||||
-rw-r--r-- | src/mame/video/ppu2c0x.c | 25 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index 3d5e485d177..7187d76897d 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -266,7 +266,6 @@ static MACHINE_DRIVER_START( cham24 ) MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MDRV_GFXDECODE(cham24) MDRV_PALETTE_LENGTH(8*4*16) - MDRV_COLORTABLE_LENGTH(4*8) MDRV_PALETTE_INIT(cham24) MDRV_VIDEO_START(cham24) diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 57edbac2132..df80dabf121 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -277,7 +277,6 @@ static MACHINE_DRIVER_START( multigam ) MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MDRV_GFXDECODE(multigam) MDRV_PALETTE_LENGTH(8*4*16) - MDRV_COLORTABLE_LENGTH(4*8) MDRV_PALETTE_INIT(multigam) MDRV_VIDEO_START(multigam) diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index dea9c975e0d..f86f3aea342 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -26,7 +26,6 @@ NES-specific: #include "driver.h" #include "profiler.h" -#include "deprecat.h" #include "video/ppu2c0x.h" /* constant definitions */ @@ -798,14 +797,12 @@ static void update_scanline(int num ) // with the palette entry at the VRAM address instead of the usual background // pen. Micro Machines makes use of this feature. int penNum; + if (this_ppu->videoram_addr & 0x03) - { penNum = this_ppu->videoram[this_ppu->videoram_addr & 0x3f1f] & 0x3f; - } else - { penNum = this_ppu->videoram[this_ppu->videoram_addr & 0x3f00] & 0x3f; - } + back_pen = chips[num].machine->pens[penNum + intf->color_base[num]]; } else @@ -825,15 +822,13 @@ static void update_scanline(int num ) UINT16 tmp; tmp = ( this_ppu->refresh_data & 0x03e0 ) + 0x20; this_ppu->refresh_data &= 0x7c1f; + /* handle bizarro scrolling rollover at the 30th (not 32nd) vertical tile */ if ( tmp == 0x03c0 ) - { this_ppu->refresh_data ^= 0x0800; - } else - { this_ppu->refresh_data |= ( tmp & 0x03e0 ); - } + //logerror("updating refresh_data: %04x\n", this_ppu->refresh_data); } } @@ -1324,10 +1319,14 @@ void ppu2c0x_spriteram_dma (int num, const UINT8 page) // Because the DMA is only useful during vblank, this may not be strictly necessary since // the scanline timers should catch us up before drawing actually happens. #if 0 - scanline_callback(Machine, num); - scanline_callback(Machine, num); - scanline_callback(Machine, num); - scanline_callback(Machine, num); +{ + ppu2c0x_chip* this_ppu = &chips[num]; + + scanline_callback(this_ppu->machine, num); + scanline_callback(this_ppu->machine, num); + scanline_callback(this_ppu->machine, num); + scanline_callback(this_ppu->machine, num); +} #endif } |