Previous 199869 Revisions Next

r37115 Saturday 11th April, 2015 at 10:01:44 UTC by Zoƫ Blade
Revert fixing variable names

Play it safe.
[src/mame/drivers]sfbonus.c
[src/mame/video]tia.c tia.h

trunk/src/mame/drivers/sfbonus.c
r245626r245627
462462   TILE_GET_INFO_MEMBER(get_sfbonus_reel4_tile_info);
463463   virtual void machine_reset();
464464   virtual void video_start();
465   void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category);
465   void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int catagory);
466466   UINT32 screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
467467};
468468
r245626r245627
929929
930930}
931931
932void sfbonus_state::draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category)
932void sfbonus_state::draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int catagory)
933933{
934934   int zz;
935935   int i;
r245626r245627
10211021
10221022      if (rowenable2==0)
10231023      {
1024         m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),3);
1024         m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3);
10251025      }
10261026      if (rowenable==0)
10271027      {
1028         m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),3);
1028         m_reel_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3);
10291029      }
10301030
10311031      if (rowenable2==0x1)
10321032      {
1033         m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),2);
1033         m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2);
10341034      }
10351035      if (rowenable==0x1)
10361036      {
1037         m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),2);
1037         m_reel2_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2);
10381038      }
10391039
10401040      if (rowenable2==0x2)
10411041      {
1042         m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),1);
1042         m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1);
10431043      }
10441044      if (rowenable==0x2)
10451045      {
1046         m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),1);
1046         m_reel3_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1);
10471047      }
10481048
10491049      if (rowenable2==0x3)
10501050      {
1051         m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),4);
1051         m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4);
10521052      }
10531053      if (rowenable==0x3)
10541054      {
1055         m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(category),4);
1055         m_reel4_tilemap->draw(screen, *m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4);
10561056      }
10571057
10581058
trunk/src/mame/video/tia.c
r245626r245627
481481
482482
483483void tia_video_device::draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start,
484   UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUMN)
484   UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUM)
485485{
486486   int num = nusiz[NUSIZ & 7][0];
487487   int skp = nusiz[NUSIZ & 7][2];
r245626r245627
508508                     if ( horz >= 0 )
509509                     {
510510                        if ( horz < 156 ) {
511                           p[(horz + 1) % 160] = COLUMN >> 1;
512                           col[(horz + 1) % 160] = COLUMN >> 1;
511                           p[(horz + 1) % 160] = COLUM >> 1;
512                           col[(horz + 1) % 160] = COLUM >> 1;
513513                        }
514                        p[horz % 160] = COLUMN >> 1;
515                        col[horz % 160] = COLUMN >> 1;
514                        p[horz % 160] = COLUM >> 1;
515                        col[horz % 160] = COLUM >> 1;
516516                     }
517517                     break;
518518                  case 2:
519519                  case 3:
520520                     if ( horz >= 0 )
521521                     {
522                        p[horz % 160] = COLUMN >> 1;
523                        col[horz % 160] = COLUMN >> 1;
522                        p[horz % 160] = COLUM >> 1;
523                        col[horz % 160] = COLUM >> 1;
524524                     }
525525                     break;
526526                  }
527527               } else {
528528                  if ( horz >= 0 )
529529                  {
530                     p[horz % 160] = COLUMN >> 1;
531                     col[horz % 160] = COLUMN >> 1;
530                     p[horz % 160] = COLUM >> 1;
531                     col[horz % 160] = COLUM >> 1;
532532                  }
533533               }
534534            }
trunk/src/mame/video/tia.h
r245626r245627
6666   virtual void device_reset();
6767
6868   void draw_sprite_helper(UINT8* p, UINT8 *col, struct player_gfx *gfx, UINT8 GRP, UINT8 COLUP, UINT8 REFP);
69   void draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start, UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUMN);
69   void draw_missile_helper(UINT8* p, UINT8* col, int horz, int skipdelay, int latch, int start, UINT8 RESMP, UINT8 ENAM, UINT8 NUSIZ, UINT8 COLUM);
7070   void draw_playfield_helper(UINT8* p, UINT8* col, int horz, UINT8 COLU, UINT8 REFPF);
7171   void draw_ball_helper(UINT8* p, UINT8* col, int horz, UINT8 ENAB);
7272   void drawS0(UINT8* p, UINT8* col);


Previous 199869 Revisions Next


© 1997-2024 The MAME Team