summaryrefslogtreecommitdiffstats
path: root/src/mame/video/circus.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
commitd2926fa02cef5bf728eac74c9e5586aced02a80b (patch)
tree820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/mame/video/circus.cpp
parent24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff)
parent68139508715a0375e657add4197582271ef446ec (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/digfx.h
Diffstat (limited to 'src/mame/video/circus.cpp')
-rw-r--r--src/mame/video/circus.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/video/circus.cpp b/src/mame/video/circus.cpp
index 63690f7d9ef..c160672f142 100644
--- a/src/mame/video/circus.cpp
+++ b/src/mame/video/circus.cpp
@@ -63,7 +63,7 @@ void circus_state::draw_line( bitmap_ind16 &bitmap, const rectangle &cliprect, i
void circus_state::draw_sprite_collision( bitmap_ind16 &bitmap, const rectangle &cliprect )
{
gfx_element *sprite_gfx = m_gfxdecode->gfx(1);
- const uint16_t *sprite_data = sprite_gfx->get_data(m_clown_z);
+ const uint8_t *sprite_data = sprite_gfx->get_data(m_clown_z);
int sx, sy, dx, dy;
int pixel, collision = 0;