Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert fixing variable names

Browse Source 
Play it safe.
This commit is contained in:
Zoë Blade 2015-04-11 11:01:44 +01:00
parent 155bb1b250
commit b9fec20184
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mame/drivers/sfbonus.c
View File

@ -462,7 +462,7 @@ public:
TILE_GET_INFO_MEMBER(get_sfbonus_reel4_tile_info); TILE_GET_INFO_MEMBER(get_sfbonus_reel4_tile_info);
virtual void machine_reset(); virtual void machine_reset();
virtual void video_start(); virtual void video_start();
void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category); void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int catagory);
UINT32 screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
}; };
@ -929,7 +929,7 @@ void sfbonus_state::video_start()
} }
void sfbonus_state::draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category) void sfbonus_state::draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int catagory)
{ {
int zz; int zz;
int i; int i;
@ -1021,38 +1021,38 @@ void sfbonus_state::draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap,
if (rowenable2==0) if (rowenable2==0)
{ {
m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),3); m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3);
} }
if (rowenable==0) if (rowenable==0)
{ {
m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),3); m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3);
} }
if (rowenable2==0x1) if (rowenable2==0x1)
{ {
m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),2); m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2);
} }
if (rowenable==0x1) if (rowenable==0x1)
{ {
m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),2); m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2);
} }
if (rowenable2==0x2) if (rowenable2==0x2)
{ {
m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),1); m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1);
} }
if (rowenable==0x2) if (rowenable==0x2)
{ {
m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),1); m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1);
} }
if (rowenable2==0x3) if (rowenable2==0x3)
{ {
m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),4); m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4);
} }
if (rowenable==0x3) if (rowenable==0x3)
{ {
m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),4); m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4);
} }

18
src/mame/video/tia.c
View File

@ -481,7 +481,7 @@ void tia_video_device::draw_sprite_helper(UINT8* p, UINT8 *col, struct player_gf
void tia_video_device::draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start, void tia_video_device::draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start,
UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUMN) UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUM)
{ {
int num = nusiz[NUSIZ & 7][0]; int num = nusiz[NUSIZ & 7][0];
int skp = nusiz[NUSIZ & 7][2]; int skp = nusiz[NUSIZ & 7][2];
@ -508,27 +508,27 @@ void tia_video_device::draw_missile_helper(UINT8* p, UINT8* col, int horz, int s
if ( horz >= 0 ) if ( horz >= 0 )
{ {
if ( horz < 156 ) { if ( horz < 156 ) {
p[(horz + 1) % 160] = COLUMN >> 1; p[(horz + 1) % 160] = COLUM >> 1;
col[(horz + 1) % 160] = COLUMN >> 1; col[(horz + 1) % 160] = COLUM >> 1;
} }
p[horz % 160] = COLUMN >> 1; p[horz % 160] = COLUM >> 1;
col[horz % 160] = COLUMN >> 1; col[horz % 160] = COLUM >> 1;
} }
break; break;
case 2: case 2:
case 3: case 3:
if ( horz >= 0 ) if ( horz >= 0 )
{ {
p[horz % 160] = COLUMN >> 1; p[horz % 160] = COLUM >> 1;
col[horz % 160] = COLUMN >> 1; col[horz % 160] = COLUM >> 1;
} }
break; break;
} }
} else { } else {
if ( horz >= 0 ) if ( horz >= 0 )
{ {
p[horz % 160] = COLUMN >> 1; p[horz % 160] = COLUM >> 1;
col[horz % 160] = COLUMN >> 1; col[horz % 160] = COLUM >> 1;
} }
} }
} }

2
src/mame/video/tia.h
View File

@ -66,7 +66,7 @@ protected:
virtual void device_reset(); virtual void device_reset();
void draw_sprite_helper(UINT8* p, UINT8 *col, struct player_gfx *gfx, UINT8 GRP, UINT8 COLUP, UINT8 REFP); void draw_sprite_helper(UINT8* p, UINT8 *col, struct player_gfx *gfx, UINT8 GRP, UINT8 COLUP, UINT8 REFP);
void draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start, UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUMN); void draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start, UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUM);
void draw_playfield_helper(UINT8* p, UINT8* col, int horz, UINT8 COLU, UINT8 REFPF); void draw_playfield_helper(UINT8* p, UINT8* col, int horz, UINT8 COLU, UINT8 REFPF);
void draw_ball_helper(UINT8* p, UINT8* col, int horz, UINT8 ENAB); void draw_ball_helper(UINT8* p, UINT8* col, int horz, UINT8 ENAB);
void drawS0(UINT8* p, UINT8* col); void drawS0(UINT8* p, UINT8* col);