diff options
author | ajrhacker <ajrhacker@users.noreply.github.com> | 2020-03-02 09:21:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-02 09:21:06 -0500 |
commit | e02db3b770baf36baeb6c634d652f435f443f945 (patch) | |
tree | 33dac3af750e9db4c8331fa9db995a42980d2207 | |
parent | f660c45620ccae2055c3b2d6229759a1997ccda1 (diff) | |
parent | d90d6bded5ed08d307d6fe8a343eb35b349f5ede (diff) |
Merge pull request #6383 from cam900/nslasher_tire
deco32.cpp : Fix wheel vs hospital wall priority
-rw-r--r-- | src/mame/video/deco32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index f637f6b48a0..023dd8ed4b0 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -335,7 +335,7 @@ void nslasher_state::mix_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, c Alpha rules: Pri 0 - Over all tilemaps, but under sprite 0 pri 0, pri 1, pri 2 - Pri 1 - Under uppermost tilemap, sprite 0 pri 0, pri 1? + Pri 1 - Under uppermost tilemap, sprite 0 pri 0, pri 1, pri 2(or over) Pri 2 - Pri 3 - */ @@ -347,7 +347,7 @@ void nslasher_state::mix_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, c destLine[x] = alpha_blend_r32(destLine[x], pal1[coloffs | ((priColAlphaPal1 & 0xff) + col1)], alpha); } else if (pri1 == 1 && ((m_pri & 1) == 0 || tilemapPri[x] < 4) - && ((priColAlphaPal0 & 0xff) == 0 || ((pri0 & 0x3) != 0 && (pri0 & 0x3) != 1))) + && ((priColAlphaPal0 & 0xff) == 0 || ((pri0 & 0x3) != 0 && (pri0 & 0x3) != 1 && ((m_pri & 1) == 0 || (pri0 & 0x3) != 2)))) destLine[x] = alpha_blend_r32(destLine[x], pal1[coloffs | ((priColAlphaPal1 & 0xff) + col1)], alpha); else if (pri1 == 2) // TODO destLine[x] = alpha_blend_r32(destLine[x], pal1[coloffs | ((priColAlphaPal1 & 0xff) + col1)], alpha); |