summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/render.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-02-27 13:35:15 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-02-27 13:35:15 +0000
commit64ac8f6776fc4451d756b0eb3bb6dbd22c49801a (patch)
treebb1d096fecec4684c8ab2b7be1b4d539ca06e57b /src/emu/render.c
parentf9d3fbaa73ccdab2e5fcf9fc095a14b4f24c3133 (diff)
Huge update, palette is now device (nw)
note: Aaron please give more descriptive text for release log I have no more strength :)
Diffstat (limited to 'src/emu/render.c')
-rw-r--r--src/emu/render.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/render.c b/src/emu/render.c
index 57b31a12a70..91f87f0c6e7 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -612,18 +612,18 @@ render_container::render_container(render_manager &manager, screen_device *scree
empty();
// if we have a screen, read and apply the options
- if (screen != NULL)
+ if (m_screen != NULL)
{
// set the initial orientation and brightness/contrast/gamma
m_user.m_orientation = manager.machine().system().flags & ORIENTATION_MASK;
m_user.m_brightness = manager.machine().options().brightness();
m_user.m_contrast = manager.machine().options().contrast();
m_user.m_gamma = manager.machine().options().gamma();
+ // allocate a client to the main palette
+ if (m_screen->palette() != NULL)
+ m_palclient = global_alloc(palette_client(*m_screen->palette()->palette()));
}
- // allocate a client to the main palette
- if (manager.machine().palette != NULL)
- m_palclient = global_alloc(palette_client(*manager.machine().palette));
recompute_lookups();
}