summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-03-28 18:32:23 -0400
committer AJR <ajrhacker@users.noreply.github.com>2018-03-28 18:33:01 -0400
commit90b896f99255de0edded9eef726d3c5b62ef7dfb (patch)
treec0242bc56aeda72184c59fa4cedfe946f0cb8b73
parent3e338cd0ec450f98b78b4dee43d65c9804b6d39e (diff)
Mixing bitwise and arithmetic operators carelessly is not a good thing (nw)
-rw-r--r--src/mame/video/aerofgt.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp
index 2fc3ccfc1dd..7b39d8d9181 100644
--- a/src/mame/video/aerofgt.cpp
+++ b/src/mame/video/aerofgt.cpp
@@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_pspikes_tile_info)
uint16_t code = m_vram[0][tile_index];
int bank = (code & 0x1000) >> 12;
SET_TILE_INFO_MEMBER(0,
- (code & 0x0fff) + (m_gfxbank[bank] << 12),
+ (code & 0x0fff) | (m_gfxbank[bank] << 12),
((code & 0xe000) >> 13) + 8 * m_charpalettebank,
0);
}
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
SET_TILE_INFO_MEMBER(Layer,
- (code & 0x1fff) + (m_gfxbank[Layer] << 13),
+ (code & 0x1fff) | (m_gfxbank[Layer] << 13),
(code & 0xe000) >> 13,
0);
}
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::spinlbrk_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
SET_TILE_INFO_MEMBER(Layer,
- (code & 0x0fff) + (m_gfxbank[Layer] << 12),
+ (code & 0x0fff) | (m_gfxbank[Layer] << 12),
(code & 0xf000) >> 12,
0);
}
@@ -45,9 +45,9 @@ template<int Layer>
TILE_GET_INFO_MEMBER(aerofgt_state::get_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
- int bank = (Layer << 2) + (code & 0x1800) >> 11;
+ int bank = (Layer << 2) | (code & 0x1800) >> 11;
SET_TILE_INFO_MEMBER(Layer,
- (code & 0x07ff) + (m_gfxbank[bank] << 11),
+ (code & 0x07ff) | (m_gfxbank[bank] << 11),
(code & 0xe000) >> 13,
0);
}