← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/aerofgt.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/aerofgt.c
383
383
                                        else
384
384
                                                code = aerofgt_spriteram2[map_start & 0x1fff] & 0x1fff;
385
385
 
386
 
                                        drawgfxzoom(bitmap,machine->gfx[sprite_gfx + (map_start >= 0x2000 ? 1 : 0)],
 
386
                                        drawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + (map_start >= 0x2000 ? 1 : 0)],
387
387
                                                        code,
388
388
                                                        color,
389
389
                                                        flipx,flipy,
390
390
                                                        sx,sy,
391
 
                                                        cliprect,TRANSPARENCY_PEN,15,
392
 
                                                        zoomx << 11, zoomy << 11);
 
391
                                                        zoomx << 11, zoomy << 11,15);
393
392
                                        map_start++;
394
393
                                }
395
394
                        }
416
415
                if (!(aerofgt_spriteram3[attr_start + 2] & 0x0080)) continue;
417
416
                pri = aerofgt_spriteram3[attr_start + 2] & 0x0010;
418
417
                if ( chip_disabled_pri & !pri) continue;
419
 
                if (!chip_disabled_pri & (pri>>4)) continue;
 
418
                if ((!chip_disabled_pri) & (pri>>4)) continue;
420
419
                ox = aerofgt_spriteram3[attr_start + 1] & 0x01ff;
421
420
                xsize = (aerofgt_spriteram3[attr_start + 2] & 0x0700) >> 8;
422
421
                zoomx = (aerofgt_spriteram3[attr_start + 1] & 0xf000) >> 12;
455
454
                                else
456
455
                                        code = aerofgt_spriteram2[map_start % (aerofgt_spriteram2_size/2)];
457
456
 
458
 
                                pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + chip],
 
457
                                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + chip],
459
458
                                                         code,
460
459
                                                         color,
461
460
                                                         flipx,flipy,
462
461
                                                         sx,sy,
463
 
                                                         cliprect,TRANSPARENCY_PEN,15,
464
462
                                                         zoomx << 11, zoomy << 11,
465
 
                                                         pri ? 0 : 2);
 
463
                                                         machine->priority_bitmap,pri ? 0 : 2,15);
466
464
                                map_start++;
467
465
                        }
468
466
 
491
489
                if (!(aerofgt_spriteram3[attr_start + 2] & 0x0080)) continue;
492
490
                pri = aerofgt_spriteram3[attr_start + 2] & 0x0010;
493
491
                if ( chip_disabled_pri & !pri) continue;
494
 
                if (!chip_disabled_pri & (pri>>4)) continue;
 
492
                if ((!chip_disabled_pri) & (pri>>4)) continue;
495
493
                ox = aerofgt_spriteram3[attr_start + 1] & 0x01ff;
496
494
                xsize = (aerofgt_spriteram3[attr_start + 2] & 0x0700) >> 8;
497
495
                zoomx = (aerofgt_spriteram3[attr_start + 1] & 0xf000) >> 12;
530
528
                                else
531
529
                                        code = aerofgt_spriteram2[map_start % (aerofgt_spriteram2_size/2)];
532
530
 
533
 
                                pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + chip],
 
531
                                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + chip],
534
532
                                                         code,
535
533
                                                         color,
536
534
                                                         flipx,flipy,
537
535
                                                         sx,sy,
538
 
                                                         cliprect,TRANSPARENCY_PEN,15,
539
536
                                                         zoomx << 11, zoomy << 11,
540
 
                                                         pri ? 2 : 0);
 
537
                                                         machine->priority_bitmap,pri ? 2 : 0,15);
541
538
                                map_start++;
542
539
                        }
543
540
 
567
564
                if (!(aerofgt_spriteram3[attr_start + 2] & 0x0080)) continue;
568
565
                pri = aerofgt_spriteram3[attr_start + 2] & 0x0010;
569
566
                if ( chip_disabled_pri & !pri) continue;
570
 
                if (!chip_disabled_pri & (pri>>4)) continue;
 
567
                if ((!chip_disabled_pri) & (pri>>4)) continue;
571
568
                ox = aerofgt_spriteram3[attr_start + 1] & 0x01ff;
572
569
                xsize = (aerofgt_spriteram3[attr_start + 2] & 0x0700) >> 8;
573
570
                zoomx = (aerofgt_spriteram3[attr_start + 1] & 0xf000) >> 12;
606
603
                                else
607
604
                                        code = aerofgt_spriteram2[map_start % (aerofgt_spriteram2_size/2)];
608
605
 
609
 
                                pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + chip],
 
606
                                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + chip],
610
607
                                                         code,
611
608
                                                         color,
612
609
                                                         flipx,flipy,
613
610
                                                         sx,sy,
614
 
                                                         cliprect,TRANSPARENCY_PEN,15,
615
611
                                                         zoomx << 11, zoomy << 11,
616
 
                                                         pri ? 0 : 2);
 
612
                                                         machine->priority_bitmap,pri ? 0 : 2,15);
617
613
                                map_start++;
618
614
                        }
619
615
 
642
638
                flipx = aerofgt_spriteram3[i + 1] & 0x0800;
643
639
                color = aerofgt_spriteram3[i + 1] & 0x000f;
644
640
 
645
 
                drawgfx(bitmap,machine->gfx[sprite_gfx],
 
641
                drawgfx_transpen(bitmap,cliprect,machine->gfx[sprite_gfx],
646
642
                                code,
647
643
                                color,
648
644
                                flipx,flipy,
649
 
                                xpos,ypos,
650
 
                                cliprect,TRANSPARENCY_PEN,15);
 
645
                                xpos,ypos,15);
651
646
 
652
647
                /* wrap around y */
653
 
                drawgfx(bitmap,machine->gfx[sprite_gfx],
 
648
                drawgfx_transpen(bitmap,cliprect,machine->gfx[sprite_gfx],
654
649
                                code,
655
650
                                color,
656
651
                                flipx,flipy,
657
 
                                xpos,ypos + 512,
658
 
                                cliprect,TRANSPARENCY_PEN,15);
 
652
                                xpos,ypos + 512,15);
659
653
 
660
654
        }
661
655
}
685
679
 
686
680
                realcode = (lookup[code] << 8) + lookup[0x10000 + code];
687
681
 
688
 
                drawgfx(bitmap,machine->gfx[sprite_gfx],
 
682
                drawgfx_transpen(bitmap,cliprect,machine->gfx[sprite_gfx],
689
683
                                realcode,
690
684
                                color,
691
685
                                flipx,flipy,
692
 
                                xpos,ypos,
693
 
                                cliprect,TRANSPARENCY_PEN,15);
 
686
                                xpos,ypos,15);
694
687
 
695
688
                /* wrap around y */
696
 
                drawgfx(bitmap,machine->gfx[sprite_gfx],
 
689
                drawgfx_transpen(bitmap,cliprect,machine->gfx[sprite_gfx],
697
690
                                realcode,
698
691
                                color,
699
692
                                flipx,flipy,
700
 
                                xpos,ypos + 512,
701
 
                                cliprect,TRANSPARENCY_PEN,15);
 
693
                                xpos,ypos + 512,15);
702
694
        }
703
695
}
704
696
 
733
725
 
734
726
                sx = ((ox + 16 + 3) & 0x1ff) - 16;
735
727
 
736
 
                pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + (code >= 0x1000 ? 0 : 1)],
 
728
                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + (code >= 0x1000 ? 0 : 1)],
737
729
                                code,
738
730
                                color,
739
731
                                flipx,flipy,
740
732
                                sx,sy,
741
 
                                cliprect,TRANSPARENCY_PEN,15,
742
733
                                zoomx << 11,zoomy << 11,
743
 
                                pri ? 0 : 2);
 
734
                                machine->priority_bitmap,pri ? 0 : 2,15);
744
735
 
745
736
        }
746
737
 
771
762
 
772
763
                sx = ((ox + 16 + 3) & 0x1ff) - 16;
773
764
 
774
 
                pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + (code >= 0x1000 ? 0 : 1)],
 
765
                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_gfx + (code >= 0x1000 ? 0 : 1)],
775
766
                                code,
776
767
                                color,
777
768
                                flipx,flipy,
778
769
                                sx,sy,
779
 
                                cliprect,TRANSPARENCY_PEN,15,
780
770
                                zoomx << 11,zoomy << 11,
781
 
                                pri ? 0 : 2);
 
771
                                machine->priority_bitmap,pri ? 0 : 2,15);
782
772
 
783
773
        }
784
774
}
813
803
                tilemap_set_scrollx(bg1_tilemap,(i + scrolly) & 0xff,aerofgt_rasterram[i]);
814
804
        tilemap_set_scrolly(bg1_tilemap,0,scrolly);
815
805
 
816
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
806
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
817
807
 
818
808
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
819
809
        turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1);
861
851
                {
862
852
                        UINT16 tileno = spikes91_tx_tilemap_ram[count]&0x1fff;
863
853
                        UINT16 colour = spikes91_tx_tilemap_ram[count]&0xe000;
864
 
                        drawgfx(bitmap,gfx,
 
854
                        drawgfx_transpen(bitmap,cliprect,gfx,
865
855
                                        tileno,
866
856
                                        colour>>13,
867
857
                                        0,0,
868
 
                                        (x*8)+24,(y*8)+8,
869
 
                                        cliprect,TRANSPARENCY_PEN,15);
 
858
                                        (x*8)+24,(y*8)+8,15);
870
859
 
871
860
                        count++;
872
861
 
884
873
        tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-4);
885
874
        tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
886
875
 
887
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
876
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
888
877
 
889
878
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
890
879
        tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0);
909
898
        tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-4);
910
899
//  tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
911
900
 
912
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
901
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
913
902
 
914
903
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
915
904
        tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
935
924
        tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-7);
936
925
        tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
937
926
 
938
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
927
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
939
928
 
940
929
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
941
930
        tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
955
944
        tilemap_set_scrollx(bg2_tilemap,0,aerofgt_rasterram[0x0200]-20);
956
945
        tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
957
946
 
958
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
947
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
959
948
 
960
949
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
961
950
 
982
971
        tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx+172);
983
972
        tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
984
973
 
985
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
974
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
986
975
 
987
976
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
988
977
        tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
1005
994
        tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-7);
1006
995
        tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
1007
996
 
1008
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
997
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
1009
998
 
1010
999
        tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
1011
1000
        tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
1028
1017
                tilemap_set_scrollx(bg1_tilemap,(i + scrolly) & 0xff,aerofgt_rasterram[i]);
1029
1018
        tilemap_set_scrolly(bg1_tilemap,0,scrolly);
1030
1019
 
1031
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
1020
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
1032
1021
 
1033
1022
        if(wbbc97_bitmap_enable)
1034
1023
        {