Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-28 19:14:55 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

remove unused parameters (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-05-25 11:44:11 +00:00
parent cc5afdbae9
commit d24b0be2ee
20 changed files with 71 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/coolridr.c
View File

@ -925,12 +925,12 @@ UINT32 coolridr_state::screen_update_coolridr(screen_device &screen, bitmap_ind1
UINT32 coolridr_state::screen_update_coolridr1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
#if 0
if (screen.machine().input().code_pressed_once(KEYCODE_W))
if (machine().input().code_pressed_once(KEYCODE_W))
{
debug_randompal++;
popmessage("%02x",debug_randompal);
}
if (screen.machine().input().code_pressed_once(KEYCODE_Q))
if (machine().input().code_pressed_once(KEYCODE_Q))
{
debug_randompal--;
popmessage("%02x",debug_randompal);

2
src/mame/drivers/cv1k.c
View File

@ -226,7 +226,7 @@ public:
UINT32 cv1k_state::screen_update_cv1k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
epic12_device::set_delay_scale(m_blitter, screen.machine().root_device().ioport(":BLITRATE")->read());
epic12_device::set_delay_scale(m_blitter, ioport(":BLITRATE")->read());
m_blitter->draw_screen(bitmap,cliprect);
return 0;

6
src/mame/drivers/firebeat.c
View File

@ -603,7 +603,7 @@ UINT32 firebeat_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap
{
bitmap.fill(0, cliprect);
if ((core_strnicmp(screen.machine().system().name, "popn", 4) == 0) || (core_strnicmp(screen.machine().system().name, "bm3", 3) == 0))
if ((core_strnicmp(machine().system().name, "popn", 4) == 0) || (core_strnicmp(machine().system().name, "bm3", 3) == 0))
{
gcu_exec_display_list( bitmap, cliprect, chip, 0x1f80000);
}
@ -633,7 +633,7 @@ UINT32 firebeat_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap
if (m_tick >= 5)
{
m_tick = 0;
if (screen.machine().input().code_pressed(KEYCODE_0))
if (machine().input().code_pressed(KEYCODE_0))
{
m_layer++;
if (m_layer > 2)
@ -643,7 +643,7 @@ UINT32 firebeat_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap
}
/*
if (screen.machine().input().code_pressed_once(KEYCODE_9))
if (machine().input().code_pressed_once(KEYCODE_9))
{
FILE *file = fopen("vram0.bin", "wb");
int i;

12
src/mame/drivers/goodejan.c
View File

@ -118,7 +118,7 @@ public:
UINT16 m_layer_en;
UINT16 m_scrollram[6];
void seibucrtc_sc0bank_w(UINT16 data);
void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
virtual void video_start();
UINT32 screen_update_goodejan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@ -296,7 +296,7 @@ TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc3_tile_info )
SET_TILE_INFO_MEMBER(4, tile, color, 0);
}
void goodejan_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
void goodejan_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
{
int offs,fx,fy,x,y,color,sprite;
int dx,dy,ax,ay;
@ -364,13 +364,13 @@ UINT32 goodejan_state::screen_update_goodejan(screen_device &screen, bitmap_ind1
m_sc3_tilemap->set_scrolly(0, (0) & 0x1ff );
if(SEIBU_CRTC_ENABLE_SC0) { m_sc0_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 2); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 2); }
if(SEIBU_CRTC_ENABLE_SC2) { m_sc2_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 1); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 1); }
if(SEIBU_CRTC_ENABLE_SC1) { m_sc1_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 0); }
if(SEIBU_CRTC_ENABLE_SC3) { m_sc3_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 3); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 3); }
return 0;
}

6
src/mame/drivers/gunpey.c
View File

@ -228,7 +228,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(gunpey_scanline);
TIMER_CALLBACK_MEMBER(blitter_end);
void gunpey_irq_check(UINT8 irq_type);
UINT8 draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int count,UINT8 scene_gradient);
UINT8 draw_gfx(bitmap_ind16 &bitmap,const rectangle &cliprect,int count,UINT8 scene_gradient);
UINT16 m_vram_bank;
UINT16 m_vreg_addr;
@ -273,7 +273,7 @@ void gunpey_state::video_start()
m_blit_buffer = auto_alloc_array(machine(), UINT16, 512*512);
}
UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int count,UINT8 scene_gradient)
UINT8 gunpey_state::draw_gfx(bitmap_ind16 &bitmap,const rectangle &cliprect,int count,UINT8 scene_gradient)
{
int x,y;
int bpp_sel;
@ -582,7 +582,7 @@ UINT32 gunpey_state::screen_update_gunpey(screen_device &screen, bitmap_ind16 &b
{
for(count = start_offs;count<end_offs;count+=0x10/2)
{
end_mark = draw_gfx(screen.machine(), bitmap,cliprect,count,scene_gradient);
end_mark = draw_gfx(bitmap,cliprect,count,scene_gradient);
if(end_mark == 0x80)
break;

10
src/mame/drivers/raiden2.c
View File

@ -514,7 +514,7 @@ void raiden2_state::cop_take_hit_box_params(UINT8 offs)
}
UINT8 raiden2_state::cop_calculate_collsion_detection(running_machine &machine)
UINT8 raiden2_state::cop_calculate_collsion_detection()
{
static UINT8 res;
@ -689,7 +689,7 @@ WRITE16_MEMBER(raiden2_state::cop_cmd_w)
/* do the math */
cop_take_hit_box_params(0);
cop_hit_status = cop_calculate_collsion_detection(space.machine());
cop_hit_status = cop_calculate_collsion_detection();
break;
case 0xb900:
@ -699,7 +699,7 @@ WRITE16_MEMBER(raiden2_state::cop_cmd_w)
/* do the math */
cop_take_hit_box_params(1);
cop_hit_status = cop_calculate_collsion_detection(space.machine());
cop_hit_status = cop_calculate_collsion_detection();
break;
default:
@ -722,7 +722,7 @@ void raiden2_state::combine32(UINT32 *val, int offset, UINT16 data, UINT16 mem_m
/* SPRITE DRAWING (move to video file) */
void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ,int pri_mask )
void raiden2_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ,int pri_mask )
{
UINT16 *source = sprites + sprites_cur_start/2 - 4;
@ -1030,7 +1030,7 @@ UINT32 raiden2_state::screen_update_raiden2(screen_device &screen, bitmap_ind16
//if (!machine().input().code_pressed(KEYCODE_S))
{
if (!(raiden2_tilemap_enable & 0x10))
draw_sprites(machine(), bitmap, cliprect, 0);
draw_sprites(bitmap, cliprect, 0);
}
//if (!machine().input().code_pressed(KEYCODE_A))

12
src/mame/drivers/sengokmj.c
View File

@ -107,7 +107,7 @@ public:
DECLARE_WRITE16_MEMBER(layer_en_w);
DECLARE_WRITE16_MEMBER(layer_scroll_w);
void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
virtual void video_start();
UINT32 screen_update_sengokmj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@ -244,7 +244,7 @@ TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc3_tile_info )
SET_TILE_INFO_MEMBER(4, tile, color, 0);
}
void sengokmj_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
void sengokmj_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
{
int offs,fx,fy,x,y,color,sprite;
int dx,dy,ax,ay;
@ -311,13 +311,13 @@ UINT32 sengokmj_state::screen_update_sengokmj(screen_device &screen, bitmap_ind1
m_sc3_tilemap->set_scrolly(0, (0) & 0x1ff );
if(SEIBU_CRTC_ENABLE_SC0) { m_sc0_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 2); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 2); }
if(SEIBU_CRTC_ENABLE_SC2) { m_sc2_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 1); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 1); }
if(SEIBU_CRTC_ENABLE_SC1) { m_sc1_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 0); }
if(SEIBU_CRTC_ENABLE_SC3) { m_sc3_tilemap->draw(screen, bitmap, cliprect, 0,0); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 3); }
if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(bitmap,cliprect, 3); }
return 0;
}

10
src/mame/drivers/wyvernf0.c
View File

@ -237,13 +237,13 @@ UINT32 wyvernf0_state::screen_update_wyvernf0(screen_device &screen, bitmap_ind1
int layers_ctrl = -1;
#ifdef MAME_DEBUG
if (screen.machine().input().code_pressed(KEYCODE_Z))
if (machine().input().code_pressed(KEYCODE_Z))
{
int msk = 0;
if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 2;
if (screen.machine().input().code_pressed(KEYCODE_A)) msk |= 4;
if (screen.machine().input().code_pressed(KEYCODE_S)) msk |= 8;
if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
if (machine().input().code_pressed(KEYCODE_A)) msk |= 4;
if (machine().input().code_pressed(KEYCODE_S)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
popmessage("fg:%02x %02x bg:%02x %02x ROM:%02x RAM:%02x",

4
src/mame/includes/raiden2.h
View File

@ -134,8 +134,8 @@ public:
UINT16 cop_hit_status;
INT16 cop_hit_val_x,cop_hit_val_y,cop_hit_val_z,cop_hit_val_unk;
void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ,int pri_mask );
UINT8 cop_calculate_collsion_detection(running_machine &machine);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ,int pri_mask );
UINT8 cop_calculate_collsion_detection();
void cop_take_hit_box_params(UINT8 offs);
DECLARE_WRITE16_MEMBER(cop_sort_lookup_hi_w);

4
src/mame/includes/tubep.h
View File

@ -111,7 +111,3 @@ public:
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
/*----------- defined in video/tubep.c -----------*/
void tubep_vblank_end(running_machine &machine);

1
src/mame/video/argus.c
View File

@ -893,7 +893,6 @@ void argus_state::valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitma
#else
void argus_state::valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
argus_state *state = screen.machine().driver_data<argus_state>();
int step = 0x10 - (m_valtric_mosaic & 0x0f);
if (step == 1)

2
src/mame/video/fuukifg2.c
View File

@ -216,7 +216,7 @@ void fuuki16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c
#ifdef MAME_DEBUG
#if 0
if (screen.machine().input().code_pressed(KEYCODE_X))
if (machine().input().code_pressed(KEYCODE_X))
{ /* Display some info on each sprite */
char buf[40];
sprintf(buf, "%Xx%X %X",xnum,ynum,(attr>>6)&3);

5
src/mame/video/gaelco3d.c
View File

@ -348,7 +348,6 @@ void gaelco3d_renderer::render_alphablend(INT32 scanline, const extent_t &extent
void gaelco3d_state::gaelco3d_render(screen_device &screen)
{
gaelco3d_state *state = screen.machine().driver_data<gaelco3d_state>();
/* wait for any queued stuff to complete */
m_poly->wait("Time to render");
@ -359,8 +358,8 @@ void gaelco3d_state::gaelco3d_render(screen_device &screen)
}
#endif
state->m_polydata_count = 0;
state->m_lastscan = -1;
m_polydata_count = 0;
m_lastscan = -1;
}

2
src/mame/video/hng64.c
View File

@ -1341,7 +1341,7 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
// press in sams64_2 attract mode for a nice debug screen from the game
// not sure how functional it is, and it doesn't appear to test everything (rowscroll modes etc.)
// but it could be useful
if ( screen.machine().input().code_pressed_once(KEYCODE_L) )
if ( machine().input().code_pressed_once(KEYCODE_L) )
{
address_space &space = m_maincpu->space(AS_PROGRAM);
space.write_byte(0x2f27c8, 0x2);

6
src/mame/video/konamigx.c
View File

@ -807,11 +807,11 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_1(screen_device &screen, bi
if (width>512) // vsnetscr case
pixeldouble_output = 1;
K053936GP_0_zoom_draw(screen.machine(), bitmap, cliprect, sub1, l, k, alpha, pixeldouble_output, m_k053936_0_ctrl_16, m_k053936_0_linectrl_16, m_k053936_0_ctrl, m_k053936_0_linectrl, m_palette);
K053936GP_0_zoom_draw(machine(), bitmap, cliprect, sub1, l, k, alpha, pixeldouble_output, m_k053936_0_ctrl_16, m_k053936_0_linectrl_16, m_k053936_0_ctrl, m_k053936_0_linectrl, m_palette);
}
else
{
screen.machine().device<k053250_device>("k053250_1")->draw(bitmap, cliprect, vcblk[4]<<l, 0, screen.priority(), 0);
machine().device<k053250_device>("k053250_1")->draw(bitmap, cliprect, vcblk[4]<<l, 0, screen.priority(), 0);
}
}
}
@ -883,7 +883,7 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_2(screen_device &screen, bi
}
}
else
screen.machine().device<k053250_device>("k053250_2")->draw(bitmap, cliprect, vcblk[5]<<l, 0, screen.priority(), 0);
machine().device<k053250_device>("k053250_2")->draw(bitmap, cliprect, vcblk[5]<<l, 0, screen.priority(), 0);
}
}

2
src/mame/video/seta.c
View File

@ -850,7 +850,7 @@ void seta_state::seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap,
flip ^= m_tilemaps_flip;
screen.machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 );
machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 );
x_0 = m_vctrl_0[ 0/2 ];
y_0 = m_vctrl_0[ 2/2 ];

12
src/mess/drivers/besta.c
View File

@ -20,7 +20,7 @@
if(VERBOSE_DBG>=N) \
{ \
if( M ) \
logerror("%11.6f: %-24s",machine.time().as_double(),(char*)M ); \
logerror("%11.6f: %-24s",machine().time().as_double(),(char*)M ); \
logerror A; \
} \
} while (0)
@ -54,12 +54,11 @@ public:
#if 1
READ8_MEMBER( besta_state::mpcc_reg_r )
{
running_machine &machine = space.machine();
UINT8 ret;
if (!(offset == 0 && !m_mpcc_regs[0])) {
DBG_LOG(1,"mpcc_reg_r",("(%d) = %02X at %s\n", offset,
(offset > 31 ? -1 : m_mpcc_regs[offset]), machine.describe_context()));
(offset > 31 ? -1 : m_mpcc_regs[offset]), machine().describe_context()));
}
switch (offset) {
@ -76,16 +75,15 @@ READ8_MEMBER( besta_state::mpcc_reg_r )
WRITE8_MEMBER( besta_state::mpcc_reg_w )
{
running_machine &machine = space.machine();
device_t *devconf = space.machine().device(TERMINAL_TAG);
device_t *devconf = machine().device(TERMINAL_TAG);
DBG_LOG(1,"mpcc_reg_w",("(%d) <- %02X at %s\n", offset, data, machine.describe_context()));
DBG_LOG(1,"mpcc_reg_w",("(%d) <- %02X at %s\n", offset, data, machine().describe_context()));
switch (offset) {
case 2:
m_term_data = data;
case 10:
dynamic_cast<generic_terminal_device *>(devconf)->write(*devconf->machine().memory().first_space(), 0, data);
dynamic_cast<generic_terminal_device *>(devconf)->write(*machine().memory().first_space(), 0, data);
default:
m_mpcc_regs[offset] = data; break;
}

12
src/mess/drivers/nakajies.c
View File

@ -295,7 +295,7 @@ public:
virtual void machine_reset();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void nakajies_update_irqs( running_machine &machine );
void nakajies_update_irqs();
DECLARE_READ8_MEMBER( irq_clear_r );
DECLARE_WRITE8_MEMBER( irq_clear_w );
DECLARE_READ8_MEMBER( irq_enable_r );
@ -405,7 +405,7 @@ ADDRESS_MAP_END
IRQ Handling
*********************************************/
void nakajies_state::nakajies_update_irqs( running_machine &machine )
void nakajies_state::nakajies_update_irqs()
{
// Hack: IRQ mask is temporarily disabled because doesn't allow the IRQ vector 0xFA
// and 0xFB that are used for scan the kb, this need further investigation.
@ -442,7 +442,7 @@ READ8_MEMBER( nakajies_state::irq_clear_r )
WRITE8_MEMBER( nakajies_state::irq_clear_w )
{
m_irq_active &= ~data;
nakajies_update_irqs(machine());
nakajies_update_irqs();
}
@ -455,7 +455,7 @@ READ8_MEMBER( nakajies_state::irq_enable_r )
WRITE8_MEMBER( nakajies_state::irq_enable_w )
{
m_irq_enabled = data;
nakajies_update_irqs(machine());
nakajies_update_irqs();
}
@ -508,7 +508,7 @@ INPUT_CHANGED_MEMBER(nakajies_state::trigger_irq)
UINT8 irqs = ioport( "debug" )->read();
m_irq_active |= irqs;
nakajies_update_irqs(machine());
nakajies_update_irqs();
}
@ -693,7 +693,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nakajies_state::kb_timer)
m_irq_active |= 0x10;
}
nakajies_update_irqs(machine());
nakajies_update_irqs();
}

28
src/mess/drivers/x1.c
View File

@ -229,9 +229,9 @@ VIDEO_START_MEMBER(x1_state,x1)
m_pal_4096 = auto_alloc_array_clear(machine(), UINT8, 0x1000*3);
}
void x1_state::x1_draw_pixel(running_machine &machine, bitmap_rgb32 &bitmap,int y,int x,UINT16 pen,UINT8 width,UINT8 height)
void x1_state::x1_draw_pixel(bitmap_rgb32 &bitmap,int y,int x,UINT16 pen,UINT8 width,UINT8 height)
{
if(!machine.first_screen()->visible_area().contains(x, y))
if(!machine().first_screen()->visible_area().contains(x, y))
return;
if(width && height)
@ -274,7 +274,7 @@ void x1_state::x1_draw_pixel(running_machine &machine, bitmap_rgb32 &bitmap,int
/* adjust tile index when we are under double height condition */
UINT8 x1_state::check_prev_height(running_machine &machine,int x,int y,int x_size)
UINT8 x1_state::check_prev_height(int x,int y,int x_size)
{
UINT8 prev_tile = m_tvram[(x+((y-1)*x_size)+mc6845_start_addr) & 0x7ff];
UINT8 cur_tile = m_tvram[(x+(y*x_size)+mc6845_start_addr) & 0x7ff];
@ -288,7 +288,7 @@ UINT8 x1_state::check_prev_height(running_machine &machine,int x,int y,int x_siz
}
/* Exoa II - Warroid: if double height isn't enabled on the first tile of the line then double height is disabled on everything else. */
UINT8 x1_state::check_line_valid_height(running_machine &machine,int y,int x_size,int height)
UINT8 x1_state::check_line_valid_height(int y,int x_size,int height)
{
UINT8 line_attr = m_avram[(0+(y*x_size)+mc6845_start_addr) & 0x7ff];
@ -298,7 +298,7 @@ UINT8 x1_state::check_line_valid_height(running_machine &machine,int y,int x_siz
return height;
}
void x1_state::draw_fgtilemap(running_machine &machine, bitmap_rgb32 &bitmap,const rectangle &cliprect)
void x1_state::draw_fgtilemap(bitmap_rgb32 &bitmap,const rectangle &cliprect)
{
/*
attribute table:
@ -364,10 +364,10 @@ void x1_state::draw_fgtilemap(running_machine &machine, bitmap_rgb32 &bitmap,con
dy = 0;
height = check_line_valid_height(machine,y,x_size,height);
height = check_line_valid_height(y,x_size,height);
if(height && y)
dy = check_prev_height(machine,x,y,x_size);
dy = check_prev_height(x,y,x_size);
/* guess: assume that Kanji VRAM doesn't double the vertical size */
if(knj_enable) { height = 0; }
@ -429,7 +429,7 @@ void x1_state::draw_fgtilemap(running_machine &machine, bitmap_rgb32 &bitmap,con
pcg_pen = pen[2]<<2|pen[1]<<1|pen[0]<<0;
if(color & 0x10 && machine.first_screen()->frame_number() & 0x10) //reverse flickering
if(color & 0x10 && machine().first_screen()->frame_number() & 0x10) //reverse flickering
pcg_pen^=7;
if(pcg_pen == 0 && (!(color & 8)))
@ -447,7 +447,7 @@ void x1_state::draw_fgtilemap(running_machine &machine, bitmap_rgb32 &bitmap,con
if(res_y < cliprect.min_y || res_y > cliprect.max_y) // partial update, TODO: optimize
continue;
x1_draw_pixel(machine,bitmap,res_y,res_x,pcg_pen,width,0);
x1_draw_pixel(bitmap,res_y,res_x,pcg_pen,width,0);
}
}
}
@ -486,7 +486,7 @@ int x1_state::priority_mixer_pri(int color)
return pri_mask_calc;
}
void x1_state::draw_gfxbitmap(running_machine &machine, bitmap_rgb32 &bitmap,const rectangle &cliprect, int plane,int pri)
void x1_state::draw_gfxbitmap(bitmap_rgb32 &bitmap,const rectangle &cliprect, int plane,int pri)
{
int xi,yi,x,y;
int pen_r,pen_g,pen_b,color;
@ -530,7 +530,7 @@ void x1_state::draw_gfxbitmap(running_machine &machine, bitmap_rgb32 &bitmap,con
if(y*(mc6845_tile_height)+yi < cliprect.min_y || y*(mc6845_tile_height)+yi > cliprect.max_y) // partial update TODO: optimize
continue;
x1_draw_pixel(machine,bitmap,y*(mc6845_tile_height)+yi,x*8+xi,color,0,0);
x1_draw_pixel(bitmap,y*(mc6845_tile_height)+yi,x*8+xi,color,0,0);
}
}
}
@ -547,9 +547,9 @@ UINT32 x1_state::screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, c
// popmessage("%d %d %d %d",mc6845_h_sync_pos,mc6845_v_sync_pos,mc6845_h_char_total,mc6845_v_char_total);
draw_gfxbitmap(machine(),bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri);
draw_fgtilemap(machine(),bitmap,cliprect);
draw_gfxbitmap(machine(),bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri^0xff);
draw_gfxbitmap(bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri);
draw_fgtilemap(bitmap,cliprect);
draw_gfxbitmap(bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri^0xff);
return 0;
}

10
src/mess/includes/x1.h
View File

@ -217,11 +217,11 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(x1_keyboard_callback);
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
void x1_draw_pixel(running_machine &machine, bitmap_rgb32 &bitmap,int y,int x,UINT16 pen,UINT8 width,UINT8 height);
void draw_fgtilemap(running_machine &machine, bitmap_rgb32 &bitmap,const rectangle &cliprect);
void draw_gfxbitmap(running_machine &machine, bitmap_rgb32 &bitmap,const rectangle &cliprect, int plane,int pri);
UINT8 check_prev_height(running_machine &machine,int x,int y,int x_size);
UINT8 check_line_valid_height(running_machine &machine,int y,int x_size,int height);
void x1_draw_pixel(bitmap_rgb32 &bitmap,int y,int x,UINT16 pen,UINT8 width,UINT8 height);
void draw_fgtilemap(bitmap_rgb32 &bitmap,const rectangle &cliprect);
void draw_gfxbitmap(bitmap_rgb32 &bitmap,const rectangle &cliprect, int plane,int pri);
UINT8 check_prev_height(int x,int y,int x_size);
UINT8 check_line_valid_height(int y,int x_size,int height);
int priority_mixer_pri(int color);
void cmt_command( UINT8 cmd );