summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/video/generic.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-06-28 06:40:44 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-06-28 06:40:44 +0000
commit41b9dbb9ace490ee8ab0bd87d35a50e9b693d538 (patch)
tree945b176affb6ad7958b2016777241736ff6f294d /src/emu/video/generic.c
parentf9a3aaf5c82bae95ba12b517beaf3fe5d4d1a93a (diff)
Made the machine_config a proper object. Added detokenize method to
this object which can be called multiple times to append new devices after the initial machine configuration is set up. Updated member variables to match new naming convention. Changed the running_machine to take a constructed machine_config object in the constructor, instead of creating one itself, for consistency. Also added machine->total_colors() as a shortcut to machine->config->m_total_colors.
Diffstat (limited to 'src/emu/video/generic.c')
-rw-r--r--src/emu/video/generic.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index ca84201e90e..da8a75d69f3 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -523,7 +523,7 @@ PALETTE_INIT( all_black )
{
int i;
- for (i = 0; i < machine->config->total_colors; i++)
+ for (i = 0; i < machine->total_colors(); i++)
{
palette_set_color(machine,i,RGB_BLACK); /* black */
}
@@ -577,7 +577,7 @@ PALETTE_INIT( RRRR_GGGG_BBBB )
{
int i;
- for (i = 0; i < machine->config->total_colors; i++)
+ for (i = 0; i < machine->total_colors(); i++)
{
int bit0,bit1,bit2,bit3,r,g,b;
@@ -589,17 +589,17 @@ PALETTE_INIT( RRRR_GGGG_BBBB )
r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
/* green component */
- bit0 = (color_prom[i + machine->config->total_colors] >> 0) & 0x01;
- bit1 = (color_prom[i + machine->config->total_colors] >> 1) & 0x01;
- bit2 = (color_prom[i + machine->config->total_colors] >> 2) & 0x01;
- bit3 = (color_prom[i + machine->config->total_colors] >> 3) & 0x01;
+ bit0 = (color_prom[i + machine->total_colors()] >> 0) & 0x01;
+ bit1 = (color_prom[i + machine->total_colors()] >> 1) & 0x01;
+ bit2 = (color_prom[i + machine->total_colors()] >> 2) & 0x01;
+ bit3 = (color_prom[i + machine->total_colors()] >> 3) & 0x01;
g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
/* blue component */
- bit0 = (color_prom[i + 2*machine->config->total_colors] >> 0) & 0x01;
- bit1 = (color_prom[i + 2*machine->config->total_colors] >> 1) & 0x01;
- bit2 = (color_prom[i + 2*machine->config->total_colors] >> 2) & 0x01;
- bit3 = (color_prom[i + 2*machine->config->total_colors] >> 3) & 0x01;
+ bit0 = (color_prom[i + 2*machine->total_colors()] >> 0) & 0x01;
+ bit1 = (color_prom[i + 2*machine->total_colors()] >> 1) & 0x01;
+ bit2 = (color_prom[i + 2*machine->total_colors()] >> 2) & 0x01;
+ bit3 = (color_prom[i + 2*machine->total_colors()] >> 3) & 0x01;
b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
palette_set_color(machine,i,MAKE_RGB(r,g,b));