summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/firetrap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/firetrap.cpp')
-rw-r--r--src/mame/video/firetrap.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/mame/video/firetrap.cpp b/src/mame/video/firetrap.cpp
index dbcceb95ea6..d395c85a5fa 100644
--- a/src/mame/video/firetrap.cpp
+++ b/src/mame/video/firetrap.cpp
@@ -36,34 +36,31 @@
***************************************************************************/
-PALETTE_INIT_MEMBER(firetrap_state, firetrap)
+void firetrap_state::firetrap_palette(palette_device &palette) const
{
- const uint8_t *color_prom = memregion("proms")->base();
- int i;
+ uint8_t const *const color_prom = memregion("proms")->base();
-
- for (i = 0; i < palette.entries(); i++)
+ for (int i = 0; i < palette.entries(); i++)
{
- int bit0, bit1, bit2, bit3, r, g, b;
-
+ int bit0, bit1, bit2, bit3;
bit0 = (color_prom[i] >> 0) & 0x01;
bit1 = (color_prom[i] >> 1) & 0x01;
bit2 = (color_prom[i] >> 2) & 0x01;
bit3 = (color_prom[i] >> 3) & 0x01;
- r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+ int const r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
bit0 = (color_prom[i] >> 4) & 0x01;
bit1 = (color_prom[i] >> 5) & 0x01;
bit2 = (color_prom[i] >> 6) & 0x01;
bit3 = (color_prom[i] >> 7) & 0x01;
- g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+ int const g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
bit0 = (color_prom[i + palette.entries()] >> 0) & 0x01;
bit1 = (color_prom[i + palette.entries()] >> 1) & 0x01;
bit2 = (color_prom[i + palette.entries()] >> 2) & 0x01;
bit3 = (color_prom[i + palette.entries()] >> 3) & 0x01;
- b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+ int const b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- palette.set_pen_color(i, rgb_t(r,g,b));
+ palette.set_pen_color(i, rgb_t(r, g, b));
}
}