← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/galastrm.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/galastrm.c
221
221
                if ((priority != 0 && sprite_ptr->primask != 0) ||
222
222
                        (priority == 0 && sprite_ptr->primask == 0))
223
223
                {
224
 
                        pdrawgfxzoom(bitmap,machine->gfx[sprite_ptr->gfx],
 
224
                        pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_ptr->gfx],
225
225
                                sprite_ptr->code,
226
226
                                sprite_ptr->color,
227
227
                                sprite_ptr->flipx,sprite_ptr->flipy,
228
228
                                sprite_ptr->x,sprite_ptr->y,
229
 
                                cliprect,TRANSPARENCY_PEN,0,
230
229
                                sprite_ptr->zoomx,sprite_ptr->zoomy,
231
 
                                primasks[sprite_ptr->primask]);
 
230
                                machine->priority_bitmap,primasks[sprite_ptr->primask],0);
232
231
                }
233
232
        }
234
233
}
463
462
        UINT16 priority;
464
463
        static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
465
464
        rectangle clip;
466
 
 
 
465
        bitmap_t *priority_bitmap = screen->machine->priority_bitmap;
467
466
 
468
467
        clip.min_x = 0;
469
468
        clip.min_y = 0;
494
493
#if 0
495
494
        if (layer[0]==0 && layer[1]==3 && layer[2]==2 && layer[3]==1)
496
495
        {
497
 
                if (!input_code_pressed(KEYCODE_Z)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[0],0,1);
498
 
                if (!input_code_pressed(KEYCODE_X)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[1],0,4);
499
 
                if (!input_code_pressed(KEYCODE_C)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[2],0,4);
500
 
                if (!input_code_pressed(KEYCODE_V)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[3],0,4);
 
496
                if (!input_code_pressed(screen->machine, KEYCODE_Z)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[0],0,1);
 
497
                if (!input_code_pressed(screen->machine, KEYCODE_X)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[1],0,4);
 
498
                if (!input_code_pressed(screen->machine, KEYCODE_C)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[2],0,4);
 
499
                if (!input_code_pressed(screen->machine, KEYCODE_V)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[3],0,4);
501
500
        }
502
501
        else
503
502
        {
504
 
                if (!input_code_pressed(KEYCODE_Z)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[0],0,1);
505
 
                if (!input_code_pressed(KEYCODE_X)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[1],0,2);
506
 
                if (!input_code_pressed(KEYCODE_C)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[2],0,4);
507
 
                if (!input_code_pressed(KEYCODE_V)) TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[3],0,8);
 
503
                if (!input_code_pressed(screen->machine, KEYCODE_Z)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[0],0,1);
 
504
                if (!input_code_pressed(screen->machine, KEYCODE_X)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[1],0,2);
 
505
                if (!input_code_pressed(screen->machine, KEYCODE_C)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[2],0,4);
 
506
                if (!input_code_pressed(screen->machine, KEYCODE_V)) TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[3],0,8);
508
507
        }
509
508
 
510
509
        if (layer[0]==3 && layer[1]==0 && layer[2]==1 && layer[3]==2)
533
532
        bitmap_fill(priority_bitmap, cliprect, 0);
534
533
        draw_sprites(screen->machine,bitmap,cliprect,primasks,0);
535
534
 
536
 
        if (!input_code_pressed(KEYCODE_B)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0);
537
 
        if (!input_code_pressed(KEYCODE_M)) TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[2],0,0);
 
535
        if (!input_code_pressed(screen->machine, KEYCODE_B)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[4],0,0);
 
536
        if (!input_code_pressed(screen->machine, KEYCODE_M)) TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[2],0,0);
538
537
 
539
538
 
540
539
#else
541
540
        if (layer[0]==0 && layer[1]==3 && layer[2]==2 && layer[3]==1)
542
541
        {
543
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[0],0,1);
544
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[1],0,4);
545
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[2],0,4);
546
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[3],0,4);
 
542
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[0],0,1);
 
543
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[1],0,4);
 
544
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[2],0,4);
 
545
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[3],0,4);
547
546
        }
548
547
        else
549
548
        {
550
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[0],0,1);
551
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[1],0,2);
552
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[2],0,4);
553
 
                TC0480SCP_tilemap_draw(tmpbitmaps,&clip,layer[3],0,8);
 
549
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[0],0,1);
 
550
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[1],0,2);
 
551
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[2],0,4);
 
552
                TC0480SCP_tilemap_draw(screen->machine,tmpbitmaps,&clip,layer[3],0,8);
554
553
        }
555
554
 
556
555
        if (layer[0]==3 && layer[1]==0 && layer[2]==1 && layer[3]==2)
579
578
        bitmap_fill(priority_bitmap, cliprect, 0);
580
579
        draw_sprites(screen->machine,bitmap,cliprect,primasks,0);
581
580
 
582
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0);
 
581
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[4],0,0);
583
582
        TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[2],0,0);
584
583
#endif
585
584