← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/superchs.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/superchs.c
176
176
                                }
177
177
                                else
178
178
                                {
179
 
                                        drawgfxzoom(bitmap,machine->gfx[sprite_ptr->gfx],
 
179
                                        drawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_ptr->gfx],
180
180
                                                        sprite_ptr->code,
181
181
                                                        sprite_ptr->color,
182
182
                                                        sprite_ptr->flipx,sprite_ptr->flipy,
183
183
                                                        sprite_ptr->x,sprite_ptr->y,
184
 
                                                        cliprect,TRANSPARENCY_PEN,0,
185
 
                                                        sprite_ptr->zoomx,sprite_ptr->zoomy);
 
184
                                                        sprite_ptr->zoomx,sprite_ptr->zoomy,0);
186
185
                                }
187
186
                        }
188
187
                }
196
195
        {
197
196
                sprite_ptr--;
198
197
 
199
 
                pdrawgfxzoom(bitmap,machine->gfx[sprite_ptr->gfx],
 
198
                pdrawgfxzoom_transpen(bitmap,cliprect,machine->gfx[sprite_ptr->gfx],
200
199
                                sprite_ptr->code,
201
200
                                sprite_ptr->color,
202
201
                                sprite_ptr->flipx,sprite_ptr->flipy,
203
202
                                sprite_ptr->x,sprite_ptr->y,
204
 
                                cliprect,TRANSPARENCY_PEN,0,
205
203
                                sprite_ptr->zoomx,sprite_ptr->zoomy,
206
 
                                sprite_ptr->primask);
 
204
                                machine->priority_bitmap,sprite_ptr->primask,0);
207
205
        }
208
206
}
209
207
 
227
225
        layer[3] = (priority &0x000f) >>  0;    /* tells us which is top */
228
226
        layer[4] = 4;   /* text layer always over bg layers */
229
227
 
230
 
        bitmap_fill(priority_bitmap,cliprect,0);
 
228
        bitmap_fill(screen->machine->priority_bitmap,cliprect,0);
231
229
 
232
230
        /* We have to assume 2nd to bottom layer is always underneath
233
231
       sprites as pdrawgfx cannot yet cope with more than 4 layers */
234
232
 
235
233
#ifdef MAME_DEBUG
236
 
        if (!input_code_pressed (KEYCODE_Z)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0);
237
 
        if (!input_code_pressed (KEYCODE_X)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,1);
238
 
        if (!input_code_pressed (KEYCODE_C)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2);
239
 
        if (!input_code_pressed (KEYCODE_V)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4);
240
 
        if (!input_code_pressed (KEYCODE_B)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8);
241
 
        if (!input_code_pressed (KEYCODE_N)) draw_sprites(screen->machine,bitmap,cliprect,primasks,48,-116);
 
234
        if (!input_code_pressed (screen->machine, KEYCODE_Z)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0);
 
235
        if (!input_code_pressed (screen->machine, KEYCODE_X)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[1],0,1);
 
236
        if (!input_code_pressed (screen->machine, KEYCODE_C)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[2],0,2);
 
237
        if (!input_code_pressed (screen->machine, KEYCODE_V)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[3],0,4);
 
238
        if (!input_code_pressed (screen->machine, KEYCODE_B)) TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[4],0,8);
 
239
        if (!input_code_pressed (screen->machine, KEYCODE_N)) draw_sprites(screen->machine,bitmap,cliprect,primasks,48,-116);
242
240
#else
243
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0);
244
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,1);
245
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2);
246
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4);
247
 
        TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8);   /* text layer */
 
241
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0);
 
242
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[1],0,1);
 
243
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[2],0,2);
 
244
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[3],0,4);
 
245
        TC0480SCP_tilemap_draw(screen->machine,bitmap,cliprect,layer[4],0,8);   /* text layer */
248
246
        draw_sprites(screen->machine, bitmap,cliprect,primasks,48,-116);
249
247
#endif
250
248
        return 0;