← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/canyon.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/canyon.c
8
8
#include "includes/canyon.h"
9
9
 
10
10
 
11
 
WRITE8_HANDLER( canyon_videoram_w )
 
11
WRITE8_MEMBER(canyon_state::canyon_videoram_w)
12
12
{
13
 
        canyon_state *state = space->machine().driver_data<canyon_state>();
14
 
        state->m_videoram[offset] = data;
15
 
        state->m_bg_tilemap->mark_tile_dirty(offset);
 
13
        m_videoram[offset] = data;
 
14
        m_bg_tilemap->mark_tile_dirty(offset);
16
15
}
17
16
 
18
17
 
84
83
        draw_bombs(screen.machine(), bitmap, cliprect);
85
84
 
86
85
        /* watchdog is disabled during service mode */
87
 
        watchdog_enable(screen.machine(), !(input_port_read(screen.machine(), "IN2") & 0x10));
 
86
        screen.machine().watchdog_enable(!(screen.machine().root_device().ioport("IN2")->read() & 0x10));
88
87
 
89
88
        return 0;
90
89
}