← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/aquarium.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/aquarium.c
12
12
        UINT8 col, flipx, flipy, chain;
13
13
        UINT16 code;
14
14
 
15
 
        for (offs = 0; offs < state->m_spriteram_size / 2; offs += 8)
 
15
        for (offs = 0; offs < state->m_spriteram.bytes() / 2; offs += 8)
16
16
        {
17
17
                code = ((state->m_spriteram[offs + 5]) & 0xff) + (((state->m_spriteram[offs + 6]) & 0xff) << 8);
18
18
                code &= 0x3fff;
96
96
        SET_TILE_INFO(2, tileno, colour, 0);
97
97
}
98
98
 
99
 
WRITE16_HANDLER( aquarium_txt_videoram_w )
 
99
WRITE16_MEMBER(aquarium_state::aquarium_txt_videoram_w)
100
100
{
101
 
        aquarium_state *state = space->machine().driver_data<aquarium_state>();
102
 
        state->m_txt_videoram[offset] = data;
103
 
        state->m_txt_tilemap->mark_tile_dirty(offset);
 
101
        m_txt_videoram[offset] = data;
 
102
        m_txt_tilemap->mark_tile_dirty(offset);
104
103
}
105
104
 
106
105
/* MID Layer */
118
117
        tileinfo.category = (state->m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5;
119
118
}
120
119
 
121
 
WRITE16_HANDLER( aquarium_mid_videoram_w )
 
120
WRITE16_MEMBER(aquarium_state::aquarium_mid_videoram_w)
122
121
{
123
 
        aquarium_state *state = space->machine().driver_data<aquarium_state>();
124
 
        state->m_mid_videoram[offset] = data;
125
 
        state->m_mid_tilemap->mark_tile_dirty(offset / 2);
 
122
        m_mid_videoram[offset] = data;
 
123
        m_mid_tilemap->mark_tile_dirty(offset / 2);
126
124
}
127
125
 
128
126
/* BAK Layer */
140
138
        tileinfo.category = (state->m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5;
141
139
}
142
140
 
143
 
WRITE16_HANDLER( aquarium_bak_videoram_w )
 
141
WRITE16_MEMBER(aquarium_state::aquarium_bak_videoram_w)
144
142
{
145
 
        aquarium_state *state = space->machine().driver_data<aquarium_state>();
146
 
        state->m_bak_videoram[offset] = data;
147
 
        state->m_bak_tilemap->mark_tile_dirty(offset / 2);
 
143
        m_bak_videoram[offset] = data;
 
144
        m_bak_tilemap->mark_tile_dirty(offset / 2);
148
145
}
149
146
 
150
147
VIDEO_START(aquarium)