summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/merit.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2014-02-19 06:07:32 +0000
committer Aaron Giles <aaron@aarongiles.com>2014-02-19 06:07:32 +0000
commit57cfaa163ee656de8f25e079eb721b3cb9720a9a (patch)
tree8b235effed1208b1c9b18d554f27154ce4df741d /src/mame/drivers/merit.c
parent5c2b6036df886a416ea727ecb72da2827b43bd93 (diff)
Switched rgb_t to a class, replacing macros with methods. Mappings are
as follows: MAKE_RGB(r,g,b) == rgb_t(r,g,b) MAKE_ARGB(a,r,g,b) == rgb_t(a,r,g,b) RGB_ALPHA(data) == data.a() RGB_RED(data) == data.r() RGB_GREEN(data) == data.g() RGB_BLUE(data) == data.b() RGB_BLACK == rgb_t::black RGB_WHITE == rgb_t::white Implicit conversions to/from UINT32 are built in as well as simple addition, subtraction, and scaling (with clamping). As a result of being a class, some stricter typing was needed in a few places but overall not too much.
Diffstat (limited to 'src/mame/drivers/merit.c')
-rw-r--r--src/mame/drivers/merit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index f956f1d148d..39b7b6b661f 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -247,7 +247,7 @@ static MC6845_BEGIN_UPDATE( begin_update )
bit0 = BIT(i,0);
bit1 = BIT(i,1);
bit2 = BIT(i,2);
- state->m_pens[i] = MAKE_RGB(dim*bit0, dim*bit1, dim*bit2);
+ state->m_pens[i] = rgb_t(dim*bit0, dim*bit1, dim*bit2);
}
return state->m_pens;