← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/fcombat.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/fcombat.c
195
195
                        else
196
196
                                code &= ~0x10, code2 |= 0x10;
197
197
 
198
 
                        drawgfx(bitmap, gfx, code2, color, xflip, yflip, x, y + gfx->height,
199
 
                                cliprect, TRANSPARENCY_PEN, 0);
 
198
                        drawgfx_transpen(bitmap, cliprect, gfx, code2, color, xflip, yflip, x, y + gfx->height, 0);
200
199
                }
201
200
 
202
201
                if(flags&0x10)
204
203
 
205
204
 
206
205
 
207
 
                        drawgfx(bitmap, gfx, code2+16, color, xflip, yflip, x, y + gfx->height,
208
 
                                cliprect, TRANSPARENCY_PEN, 0);
209
 
                        drawgfx(bitmap, gfx, code2+16*2, color, xflip, yflip, x, y + 2*gfx->height,
210
 
                                cliprect, TRANSPARENCY_PEN, 0);
211
 
                        drawgfx(bitmap, gfx, code2+16*3, color, xflip, yflip, x, y + 3*gfx->height,
212
 
                                cliprect, TRANSPARENCY_PEN, 0);
 
206
                        drawgfx_transpen(bitmap, cliprect, gfx, code2+16, color, xflip, yflip, x, y + gfx->height, 0);
 
207
                        drawgfx_transpen(bitmap, cliprect, gfx, code2+16*2, color, xflip, yflip, x, y + 2*gfx->height, 0);
 
208
                        drawgfx_transpen(bitmap, cliprect, gfx, code2+16*3, color, xflip, yflip, x, y + 3*gfx->height, 0);
213
209
 
214
210
                }
215
211
 
216
212
 
217
213
 
218
 
                drawgfx(bitmap, gfx, code, color, xflip, yflip, x, y,
219
 
                        cliprect, TRANSPARENCY_PEN, 0);
 
214
                drawgfx_transpen(bitmap, cliprect, gfx, code, color, xflip, yflip, x, y, 0);
220
215
 
221
216
                if (doubled) i += 4;
222
217
        }
229
224
                        int y = fcombat_cocktail_flip ? (31*8 - 8*sy) : 8*sy;
230
225
 
231
226
                        offs = sx + sy * 64;
232
 
                        drawgfx(bitmap, screen->machine->gfx[0],
 
227
                        drawgfx_transpen(bitmap, cliprect, screen->machine->gfx[0],
233
228
                                videoram[offs] + 256 * char_bank,
234
229
                                ((videoram[offs] & 0xf0) >> 4) + char_palette * 16,
235
 
                                fcombat_cocktail_flip, fcombat_cocktail_flip, x, y,
236
 
                                cliprect, TRANSPARENCY_PEN, 0);
 
230
                                fcombat_cocktail_flip, fcombat_cocktail_flip, x, y, 0);
237
231
                }
238
232
        return 0;
239
233
}