← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/taito_f3.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/taito_f3.c
2619
2619
        dest++;                                         \
2620
2620
        pri++;
2621
2621
 
2622
 
INLINE void f3_drawgfx( running_machine *machine,
2623
 
                bitmap_t *dest_bmp,const gfx_element *gfx,
 
2622
INLINE void f3_drawgfx(
 
2623
                bitmap_t *dest_bmp,const rectangle *clip,const gfx_element *gfx,
2624
2624
                UINT32 code,
2625
2625
                UINT32 color,
2626
2626
                int flipx,int flipy,
2627
2627
                int sx,int sy,
2628
 
                const rectangle *clip,
2629
2628
                UINT8 pri_dst)
2630
2629
{
2631
2630
        rectangle myclip;
2651
2650
 
2652
2651
        if( gfx )
2653
2652
        {
2654
 
                const pen_t *pal = &machine->pens[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
 
2653
                const pen_t *pal = &gfx->machine->pens[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
2655
2654
                const UINT8 *code_base = gfx_element_get_data(gfx, code % gfx->total_elements);
2656
2655
 
2657
2656
                {
2783
2782
#undef NEXT_P
2784
2783
 
2785
2784
 
2786
 
INLINE void f3_drawgfxzoom(running_machine *machine,
2787
 
                bitmap_t *dest_bmp,const gfx_element *gfx,
 
2785
INLINE void f3_drawgfxzoom(
 
2786
                bitmap_t *dest_bmp,const rectangle *clip,const gfx_element *gfx,
2788
2787
                UINT32 code,
2789
2788
                UINT32 color,
2790
2789
                int flipx,int flipy,
2791
2790
                int sx,int sy,
2792
 
                const rectangle *clip,
2793
2791
                int scalex, int scaley,
2794
2792
                UINT8 pri_dst)
2795
2793
{
2816
2814
 
2817
2815
        if( gfx )
2818
2816
        {
2819
 
                const pen_t *pal = &machine->pens[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
 
2817
                const pen_t *pal = &gfx->machine->pens[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
2820
2818
                const UINT8 *code_base = gfx_element_get_data(gfx, code % gfx->total_elements);
2821
2819
 
2822
2820
                {
3206
3204
                sprite_pri_usage|=1<<pri;
3207
3205
 
3208
3206
                if(sprite_ptr->zoomx==16 && sprite_ptr->zoomy==16)
3209
 
                        f3_drawgfx(machine,
3210
 
                                        bitmap,sprite_gfx,
 
3207
                        f3_drawgfx(
 
3208
                                        bitmap,cliprect,sprite_gfx,
3211
3209
                                        sprite_ptr->code,
3212
3210
                                        sprite_ptr->color & (~sprite_extra_planes),
3213
3211
                                        sprite_ptr->flipx,sprite_ptr->flipy,
3214
3212
                                        sprite_ptr->x,sprite_ptr->y,
3215
 
                                        cliprect,
3216
3213
                                        pri);
3217
3214
                else
3218
 
                        f3_drawgfxzoom(machine,
3219
 
                                        bitmap,sprite_gfx,
 
3215
                        f3_drawgfxzoom(
 
3216
                                        bitmap,cliprect,sprite_gfx,
3220
3217
                                        sprite_ptr->code,
3221
3218
                                        sprite_ptr->color & (~sprite_extra_planes),
3222
3219
                                        sprite_ptr->flipx,sprite_ptr->flipy,
3223
3220
                                        sprite_ptr->x,sprite_ptr->y,
3224
 
                                        cliprect,
3225
3221
                                        sprite_ptr->zoomx,sprite_ptr->zoomy,
3226
3222
                                        pri);
3227
3223
        }
3234
3230
        UINT32 sy_fix[5],sx_fix[5];
3235
3231
 
3236
3232
        f3_skip_this_frame=0;
3237
 
        tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
 
3233
        tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
3238
3234
 
3239
3235
        /* Setup scroll */
3240
3236
        sy_fix[0]=((f3_control_0[2]&0xffff0000)>> 7) + (1<<16);