diff options
author | 2019-07-20 12:31:21 +1000 | |
---|---|---|
committer | 2019-07-20 12:31:21 +1000 | |
commit | d2926fa02cef5bf728eac74c9e5586aced02a80b (patch) | |
tree | 820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/mame/drivers/scyclone.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/drivers/scyclone.cpp')
-rw-r--r-- | src/mame/drivers/scyclone.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index a2c9aeeb2e6..c85861d269f 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -126,7 +126,7 @@ private: uint8_t m_hascollided; /* video-related */ - const uint16_t get_sprite_pixel(int x, int y); + const uint8_t get_sprite_pixel(int x, int y); const uint8_t get_bitmap_pixel(int x, int y); uint32_t draw_starfield(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t draw_bitmap_and_sprite(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -158,7 +158,7 @@ void scyclone_state::video_start() } } -const uint16_t scyclone_state::get_sprite_pixel(int x, int y) +const uint8_t scyclone_state::get_sprite_pixel(int x, int y) { int minx = 0xe0-m_sprite_xpos; int miny = 0xe0-m_sprite_ypos; @@ -178,9 +178,9 @@ const uint16_t scyclone_state::get_sprite_pixel(int x, int y) int sprx = x-minx; int spry = y-miny; - const uint16_t* srcdata = m_gfxdecode->gfx(0)->get_data(code); + const uint8_t* srcdata = m_gfxdecode->gfx(0)->get_data(code); - uint16_t pix = srcdata[spry*32 + sprx] + col*4; + uint8_t pix = srcdata[spry*32 + sprx] + col*4; return pix; } @@ -275,7 +275,7 @@ uint32_t scyclone_state::draw_bitmap_and_sprite(screen_device &screen, bitmap_rg if (pal) bitmap.pix32(y, (x*8)+i) = paldata[pal]; - uint16_t pal2 = get_sprite_pixel(realx, realy); + uint8_t pal2 = get_sprite_pixel(realx, realy); if (pal2 & 0x3) { |