← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/mame/video/combatsc.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/video/combatsc.c
12
12
 
13
13
PALETTE_INIT( combatsc )
14
14
{
 
15
        const UINT8 *color_prom = machine.root_device().memregion("proms")->base();
15
16
        int pal;
16
17
 
17
18
        /* allocate the colortable */
62
63
 
63
64
PALETTE_INIT( combatscb )
64
65
{
 
66
        const UINT8 *color_prom = machine.root_device().memregion("proms")->base();
65
67
        int pal;
66
68
 
67
69
        /* allocate the colortable */
331
333
 
332
334
***************************************************************************/
333
335
 
334
 
READ8_HANDLER( combatsc_video_r )
 
336
READ8_MEMBER(combatsc_state::combatsc_video_r)
335
337
{
336
 
        combatsc_state *state = space->machine().driver_data<combatsc_state>();
337
 
        return state->m_videoram[offset];
 
338
        return m_videoram[offset];
338
339
}
339
340
 
340
 
WRITE8_HANDLER( combatsc_video_w )
 
341
WRITE8_MEMBER(combatsc_state::combatsc_video_w)
341
342
{
342
 
        combatsc_state *state = space->machine().driver_data<combatsc_state>();
343
 
        state->m_videoram[offset] = data;
 
343
        m_videoram[offset] = data;
344
344
 
345
345
        if (offset < 0x800)
346
346
        {
347
 
                if (state->m_video_circuit)
348
 
                        state->m_bg_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
 
347
                if (m_video_circuit)
 
348
                        m_bg_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
349
349
                else
350
 
                        state->m_bg_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
 
350
                        m_bg_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
351
351
        }
352
 
        else if (offset < 0x1000 && state->m_video_circuit == 0)
 
352
        else if (offset < 0x1000 && m_video_circuit == 0)
353
353
        {
354
 
                state->m_textlayer->mark_tile_dirty(offset & 0x3ff);
 
354
                m_textlayer->mark_tile_dirty(offset & 0x3ff);
355
355
        }
356
356
}
357
357
 
358
 
WRITE8_HANDLER( combatsc_pf_control_w )
 
358
WRITE8_MEMBER(combatsc_state::combatsc_pf_control_w)
359
359
{
360
 
        combatsc_state *state = space->machine().driver_data<combatsc_state>();
361
 
        device_t *k007121 = state->m_video_circuit ? state->m_k007121_2 : state->m_k007121_1;
 
360
        device_t *k007121 = m_video_circuit ? m_k007121_2 : m_k007121_1;
362
361
        k007121_ctrl_w(k007121, offset, data);
363
362
 
364
363
        if (offset == 7)
365
 
                state->m_bg_tilemap[state->m_video_circuit]->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
 
364
                m_bg_tilemap[m_video_circuit]->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
366
365
 
367
366
        if (offset == 3)
368
367
        {
369
368
                if (data & 0x08)
370
 
                        memcpy(state->m_spriteram[state->m_video_circuit], state->m_page[state->m_video_circuit] + 0x1000, 0x800);
 
369
                        memcpy(m_spriteram[m_video_circuit], m_page[m_video_circuit] + 0x1000, 0x800);
371
370
                else
372
 
                        memcpy(state->m_spriteram[state->m_video_circuit], state->m_page[state->m_video_circuit] + 0x1800, 0x800);
 
371
                        memcpy(m_spriteram[m_video_circuit], m_page[m_video_circuit] + 0x1800, 0x800);
373
372
        }
374
373
}
375
374
 
376
 
READ8_HANDLER( combatsc_scrollram_r )
 
375
READ8_MEMBER(combatsc_state::combatsc_scrollram_r)
377
376
{
378
 
        combatsc_state *state = space->machine().driver_data<combatsc_state>();
379
 
        return state->m_scrollram[offset];
 
377
        return m_scrollram[offset];
380
378
}
381
379
 
382
 
WRITE8_HANDLER( combatsc_scrollram_w )
 
380
WRITE8_MEMBER(combatsc_state::combatsc_scrollram_w)
383
381
{
384
 
        combatsc_state *state = space->machine().driver_data<combatsc_state>();
385
 
        state->m_scrollram[offset] = data;
 
382
        m_scrollram[offset] = data;
386
383
}
387
384
 
388
385