← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/playmark.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/playmark.c
361
361
                if(!pri && (color & 0x0c) == 0x0c)
362
362
                        pri = 2;
363
363
 
364
 
                pdrawgfx(bitmap,machine->gfx[0],
 
364
                pdrawgfx_transpen(bitmap,cliprect,machine->gfx[0],
365
365
                                 code,
366
366
                                 color,
367
367
                                 flipx,0,
368
368
                                 sx + xoffset,sy + yoffset,
369
 
                                 cliprect,TRANSPARENCY_PEN,0,pri_masks[pri]);
 
369
                                 machine->priority_bitmap,pri_masks[pri],0);
370
370
        }
371
371
}
372
372
 
373
 
static void draw_bitmap(bitmap_t *bitmap, const rectangle *cliprect)
 
373
static void draw_bitmap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
374
374
{
375
375
        int x,y,count;
376
376
        int color;
389
389
                                {
390
390
                                        *BITMAP_ADDR16(bitmap, (y + bgscrolly) & 0x1ff, (x + bgscrollx) & 0x1ff) = 0x100 + color;
391
391
 
392
 
                                        pri = BITMAP_ADDR8(priority_bitmap, (y + bgscrolly) & 0x1ff, 0);
 
392
                                        pri = BITMAP_ADDR8(machine->priority_bitmap, (y + bgscrolly) & 0x1ff, 0);
393
393
                                        pri[(x + bgscrollx) & 0x1ff] |= 2;
394
394
                                }
395
395
                                else
399
399
                                        {
400
400
                                                *BITMAP_ADDR16(bitmap, (y / 2 + bgscrolly) & 0x1ff, (x / 2 + bgscrollx) & 0x1ff) = 0x100 + color;
401
401
 
402
 
                                                pri = BITMAP_ADDR8(priority_bitmap, (y / 2 + bgscrolly) & 0x1ff, 0);
 
402
                                                pri = BITMAP_ADDR8(machine->priority_bitmap, (y / 2 + bgscrolly) & 0x1ff, 0);
403
403
                                                pri[(x / 2 + bgscrollx) & 0x1ff] |= 2;
404
404
                                        }
405
405
                                }
412
412
 
413
413
VIDEO_UPDATE( bigtwin )
414
414
{
415
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
415
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
416
416
 
417
417
        tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
418
418
        if (bg_enable)
419
 
                draw_bitmap(bitmap, cliprect);
 
419
                draw_bitmap(screen->machine, bitmap, cliprect);
420
420
        draw_sprites(screen->machine, bitmap,cliprect,4);
421
421
        tilemap_draw(bitmap,cliprect,tx_tilemap,0,0);
422
422
        return 0;
424
424
 
425
425
VIDEO_UPDATE( excelsr )
426
426
{
427
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
427
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
428
428
 
429
429
        tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
430
430
        if (bg_enable)
431
 
                draw_bitmap(bitmap, cliprect);
 
431
                draw_bitmap(screen->machine, bitmap, cliprect);
432
432
        tilemap_draw(bitmap,cliprect,tx_tilemap,0,4);
433
433
        draw_sprites(screen->machine,bitmap,cliprect,2);
434
434
        return 0;
450
450
                tilemap_set_scrollx(fg_tilemap,0,fgscrollx);
451
451
        }
452
452
 
453
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
453
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
454
454
 
455
455
        tilemap_draw(bitmap,cliprect,bg_tilemap,0,1);
456
456
        tilemap_draw(bitmap,cliprect,fg_tilemap,0,2);
461
461
 
462
462
VIDEO_UPDATE( hrdtimes )
463
463
{
464
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
464
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
465
465
 
466
466
        // video enabled
467
467
        if(playmark_scroll[6] & 1)