summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2022-08-27 22:54:10 +0200
committer hap <happppp@users.noreply.github.com>2022-08-27 22:54:20 +0200
commit4cec73607502adf55340c0bb490f3ff44860af80 (patch)
tree07bdcf96e7d165ef020c6813cd44f793260cf057
parentf01420ee79275594f3a5f8d8250a46d778f1c91e (diff)
redclash: bigger player bullets
-rw-r--r--src/mame/universal/redclash.cpp5
-rw-r--r--src/mame/universal/redclash_v.cpp33
2 files changed, 23 insertions, 15 deletions
diff --git a/src/mame/universal/redclash.cpp b/src/mame/universal/redclash.cpp
index 422642c562e..71514a09e0d 100644
--- a/src/mame/universal/redclash.cpp
+++ b/src/mame/universal/redclash.cpp
@@ -19,8 +19,9 @@ TODO:
- Some graphical problems in both games
- redclash supports more background layer effects: white+mixed with other colors,
used in canyon parts and during the big ufo explosion
-- Player bullets: should be 8*2px magenta in zerohour. It's weirder in redclash:
- 1st half of the screen 4*2px red, 2nd half 8*2px yellow.
+- According to video reference(could only find 1), redclash player bullets should be
+ 4*2px red on the 1st half of the screen and 8*2px yellow on the 2nd half, zerohour
+ bullets are correct though(always 8*2px magenta)
- Sound (analog, schematics available for Zero Hour)
***************************************************************************/
diff --git a/src/mame/universal/redclash_v.cpp b/src/mame/universal/redclash_v.cpp
index b8e606c97dd..15f286ea210 100644
--- a/src/mame/universal/redclash_v.cpp
+++ b/src/mame/universal/redclash_v.cpp
@@ -142,6 +142,7 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
{
for (int offs = m_spriteram.bytes() - 0x20; offs >= 0; offs -= 0x20)
{
+ // find last valid sprite of current block
int i = 0;
while (i < 0x20 && m_spriteram[offs + i] != 0)
i += 4;
@@ -154,7 +155,7 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
{
int color = bitswap<4>(m_spriteram[offs + i + 2], 5,2,1,0);
int sx = m_spriteram[offs + i + 3];
- int sy = offs / 4 + (m_spriteram[offs + i] & 0x07);
+ int sy = offs / 4 + (m_spriteram[offs + i] & 0x07) - 16;
switch ((m_spriteram[offs + i] & 0x18) >> 3)
{
@@ -166,13 +167,13 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
code,
color,
0,0,
- sx,sy - 16,0);
+ sx,sy,0);
/* wraparound */
m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
code,
color,
0,0,
- sx - 256,sy - 16,0);
+ sx - 256,sy,0);
break;
}
@@ -186,7 +187,7 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
code,
color,
0,0,
- sx,sy - 16,0);
+ sx,sy,0);
}
else
{
@@ -196,7 +197,7 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
code,
color,
0,0,
- sx,sy - 16,0);
+ sx,sy,0);
}
break;
@@ -205,7 +206,7 @@ void redclash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
m_spriteram[offs + i + 1],// + 4 * (m_spriteram[offs + i + 2] & 0x10),
color,
0,0,
- sx,sy - 16,0);
+ sx,sy,0);
break;
case 0:
@@ -221,16 +222,22 @@ void redclash_state::draw_bullets( bitmap_ind16 &bitmap, const rectangle &clipre
{
for (int offs = 0; offs < 0x20; offs++)
{
- int sx = 8 * offs + (m_videoram[offs] & 0x07); /* ?? */
+ int sx = 8 * offs + 8;
int sy = 0xff - m_videoram[offs + 0x20];
if (flip_screen())
- {
- sx = 240 - sx;
- }
+ sx = 264 - sx;
+
+ int fine_x = m_videoram[offs] >> 3 & 7;
+ sx = sx - fine_x;
+
+ for (int y = 0; y < 2; y++)
+ for (int x = 0; x < 8; x++)
+ {
+ if (cliprect.contains(sx + x, sy - y))
+ bitmap.pix(sy - y, sx + x) = 0x3f;
+ }
- if (cliprect.contains(sx, sy))
- bitmap.pix(sy, sx) = 0x19;
}
}
@@ -245,8 +252,8 @@ uint32_t redclash_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
{
bitmap.fill(m_palette->black_pen(), cliprect);
m_stars->draw(bitmap, cliprect, 0x60, true, 0x00, 0xff);
- draw_sprites(bitmap, cliprect);
draw_bullets(bitmap, cliprect);
+ draw_sprites(bitmap, cliprect);
m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
return 0;
}