← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sdlmame/lucid

« back to all changes in this revision

Viewing changes to src/mame/video/combatsc.c

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Falco
  • Date: 2009-11-03 17:10:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091103171015-6hop4ory5lxnumpn
Tags: 0.135-0ubuntu1
https://launchpad.net/bugs/403212
* New upstream release - Closes (LP: #403212)
* debian/watch: unstable releases are no longer detected
* mame.ini: added the cheat subdirectories to cheatpath so zipped
  cheatfiles will be searched too
* renamed crsshair subdirectory to crosshair to reflect upstream change
* mame.ini: renamed references to crosshair subdirectory (see above)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/video/combatsc.c
443
443
 
444
444
WRITE8_HANDLER( combasc_pf_control_w )
445
445
{
446
 
        K007121_ctrl_w(combasc_video_circuit,offset,data);
 
446
        K007121_ctrl_w(space->machine,combasc_video_circuit,offset,data);
447
447
 
448
448
        if (offset == 7)
449
449
                tilemap_set_flip(bg_tilemap[combasc_video_circuit],(data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
479
479
{
480
480
        int base_color = (circuit*4)*16+(K007121_ctrlram[circuit][6]&0x10)*2;
481
481
 
482
 
        K007121_sprites_draw(circuit,bitmap,machine->gfx,machine->colortable,cliprect,source,base_color,0,0,pri_mask);
 
482
        K007121_sprites_draw(circuit,bitmap,cliprect,machine->gfx,machine->colortable,source,base_color,0,0,pri_mask);
483
483
}
484
484
 
485
485
 
516
516
        tilemap_set_scrolly(bg_tilemap[0],0,K007121_ctrlram[0][0x02]);
517
517
        tilemap_set_scrolly(bg_tilemap[1],0,K007121_ctrlram[1][0x02]);
518
518
 
519
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
519
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
520
520
 
521
521
        if (priority == 0)
522
522
        {
630
630
//          if(combasc_vreg == 0x23 && (attributes & 0x02)) color += 1*16;
631
631
//          if(combasc_vreg == 0x66 ) color += 2*16;
632
632
 
633
 
                        drawgfx( bitmap, gfx,
 
633
                        drawgfx_transpen( bitmap, cliprect, gfx,
634
634
                                number, color,
635
635
                                attributes & 0x10,0, /* flip */
636
 
                                x,y,
637
 
                                cliprect, TRANSPARENCY_PEN, 15 );
 
636
                                x,y, 15 );
638
637
                }
639
638
                source -= 8;
640
639
        }