diff options
| author | 2008-02-03 03:44:44 +0000 | |
|---|---|---|
| committer | 2008-02-03 03:44:44 +0000 | |
| commit | 716431f20eec0c2fc3c9fc9d8cb12820ee8c2dcb (patch) | |
| tree | 085d9a52ac296baf29d6d6f26d5bb71dd47f0602 /src | |
| parent | c4197196facb3611940dc7415b41ba981226ed39 (diff) | |
Made K007121_sprites_draw not require a 'machine' argument
Diffstat (limited to 'src')
| -rw-r--r-- | src/mame/video/combatsc.c | 2 | ||||
| -rw-r--r-- | src/mame/video/contra.c | 2 | ||||
| -rw-r--r-- | src/mame/video/fastlane.c | 2 | ||||
| -rw-r--r-- | src/mame/video/flkatck.c | 2 | ||||
| -rw-r--r-- | src/mame/video/hcastle.c | 2 | ||||
| -rw-r--r-- | src/mame/video/konamiic.c | 12 | ||||
| -rw-r--r-- | src/mame/video/konamiic.h | 6 | ||||
| -rw-r--r-- | src/mame/video/labyrunr.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index b32bdf57260..6628a6d6bb7 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -481,7 +481,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re { int base_color = (circuit*4)*16+(K007121_ctrlram[circuit][6]&0x10)*2; - K007121_sprites_draw(machine,circuit,bitmap,cliprect,source,base_color,0,0,pri_mask); + K007121_sprites_draw(circuit,bitmap,machine->gfx,machine->colortable,cliprect,source,base_color,0,0,pri_mask); } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index 4ceb36ab305..fb9de3874bc 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -275,7 +275,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re if (bank==0) source=private_spriteram; else source=private_spriteram_2; - K007121_sprites_draw(machine,bank,bitmap,cliprect,source,base_color,40,0,-1); + K007121_sprites_draw(bank,bitmap,machine->gfx,machine->colortable,cliprect,source,base_color,40,0,-1); } VIDEO_UPDATE( contra ) diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index a753f5d3376..79277f5b891 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -163,7 +163,7 @@ VIDEO_UPDATE( fastlane ) tilemap_set_scrolly( layer0, 0, K007121_ctrlram[0][0x02] ); tilemap_draw(bitmap,&finalclip0,layer0,0,0); - K007121_sprites_draw(machine,0,bitmap,cliprect,spriteram,0,40,0,-1); + K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,0,40,0,-1); tilemap_draw(bitmap,&finalclip1,layer1,0,0); return 0; } diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index 1a1c0fee526..18625fbd741 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -172,7 +172,7 @@ popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %02x-%02x-%02x-%02x-%02x-%0 /* draw the graphics */ tilemap_draw(bitmap,&final_clip[0],k007121_tilemap[0],0,0); - K007121_sprites_draw(machine,0,bitmap,cliprect,&k007121_ram[0x1000],0,40,0,-1); + K007121_sprites_draw(0,bitmap,machine->gfx,NULL,cliprect,&k007121_ram[0x1000],0,40,0,-1); tilemap_draw(bitmap,&final_clip[1],k007121_tilemap[1],0,0); return 0; } diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index e55bf333249..40a4e76814e 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -201,7 +201,7 @@ WRITE8_HANDLER( hcastle_pf2_control_w ) static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect, UINT8 *sbank, int bank ) { int bank_base = (bank == 0) ? 0x4000 * (gfx_bank & 1) : 0; - K007121_sprites_draw(machine,bank,bitmap,cliprect,sbank,(K007121_ctrlram[bank][6]&0x30)*2,0,bank_base,-1); + K007121_sprites_draw(bank,bitmap,machine->gfx,machine->colortable,cliprect,sbank,(K007121_ctrlram[bank][6]&0x30)*2,0,bank_base,-1); } /*****************************************************************************/ diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index db1c9616fd4..a22b44a4d2d 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1299,14 +1299,14 @@ WRITE8_HANDLER( K007121_ctrl_1_w ) * */ -void K007121_sprites_draw(running_machine *machine, int chip,mame_bitmap *bitmap,const rectangle *cliprect, - const UINT8 *source,int base_color,int global_x_offset,int bank_base, - UINT32 pri_mask) +void K007121_sprites_draw(int chip,mame_bitmap *bitmap,gfx_element **gfxs, colortable_t *ctable, + const rectangle *cliprect, const UINT8 *source,int base_color, + int global_x_offset,int bank_base, UINT32 pri_mask) { - const gfx_element *gfx = machine->gfx[chip]; + const gfx_element *gfx = gfxs[chip]; int flipscreen = K007121_flipscreen[chip]; int i,num,inc,offs[5],trans; - int is_flakatck = K007121_ctrlram[chip][0x06] & 0x04; /* WRONG!!!! */ + int is_flakatck = (ctable == NULL); #if 0 popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x", @@ -1386,7 +1386,7 @@ if (input_code_pressed(KEYCODE_D)) if (trans == TRANSPARENCY_PEN) transparent_color = 0; else - transparent_color = colortable_get_transpen_mask(machine->colortable, gfx, color, 0); + transparent_color = colortable_get_transpen_mask(ctable, gfx, color, 0); if (!is_flakatck || source[0x00]) /* Flak Attack needs this */ { diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index c71e9815ea7..0a719949f2b 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -11,9 +11,9 @@ extern UINT8 K007121_ctrlram[MAX_K007121][8]; void K007121_ctrl_w(int chip,int offset,int data); WRITE8_HANDLER( K007121_ctrl_0_w ); WRITE8_HANDLER( K007121_ctrl_1_w ); -void K007121_sprites_draw(running_machine *machine,int chip,mame_bitmap *bitmap,const rectangle *cliprect, - const UINT8 *source,int base_color,int global_x_offset,int bank_base, - UINT32 pri_mask); +void K007121_sprites_draw(int chip,mame_bitmap *bitmap,gfx_element **gfxs, colortable_t *ctable, + const rectangle *cliprect, const UINT8 *source,int base_color, + int global_x_offset,int bank_base, UINT32 pri_mask); void K007342_vh_start(int gfx_index, void (*callback)(int layer,int bank,int *code,int *color,int *flags)); diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index 019ac07195a..5918a8788bb 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -201,7 +201,7 @@ VIDEO_UPDATE( labyrunr ) } tilemap_draw(bitmap,&finalclip0,layer0,TILEMAP_DRAW_OPAQUE,0); - K007121_sprites_draw(machine,0,bitmap,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); + K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); /* we ignore the transparency because layer1 is drawn only at the top of the screen also covering sprites */ tilemap_draw(bitmap,&finalclip1,layer1,TILEMAP_DRAW_OPAQUE,0); } @@ -269,7 +269,7 @@ VIDEO_UPDATE( labyrunr ) tilemap_draw(bitmap,&finalclip1,layer1,0,1); if(use_clip3[1]) tilemap_draw(bitmap,&finalclip3,layer1,0,1); - K007121_sprites_draw(machine,0,bitmap,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); + K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); } return 0; } |
