diff options
author | 2016-03-12 12:31:13 +0100 | |
---|---|---|
committer | 2016-03-12 12:31:13 +0100 | |
commit | a026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch) | |
tree | e31573822f2359677de519f9f3b600d98e8764cd /src/emu/emupal.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/emupal.cpp')
-rw-r--r-- | src/emu/emupal.cpp | 65 |
1 files changed, 15 insertions, 50 deletions
diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index e3d2dcd97a1..ccd0b26d324 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -744,79 +744,44 @@ void palette_device::configure_rgb_shadows(int mode, float factor) void palette_device::palette_init_all_black(palette_device &palette) { - int i; - - for (i = 0; i < palette.entries(); i++) + for (int i = 0; i < palette.entries(); i++) { - palette.set_pen_color(i,rgb_t::black); // black + palette.set_pen_color(i, rgb_t::black); } } /*------------------------------------------------- - black_and_white - basic 2-color black & white --------------------------------------------------*/ - -void palette_device::palette_init_black_and_white(palette_device &palette) -{ - palette.set_pen_color(0,rgb_t::black); // black - palette.set_pen_color(1,rgb_t::white); // white -} - - -/*------------------------------------------------- - white_and_black - basic 2-color white & black --------------------------------------------------*/ - -void palette_device::palette_init_white_and_black(palette_device &palette) -{ - palette.set_pen_color(0,rgb_t::white); // white - palette.set_pen_color(1,rgb_t::black); // black -} - - -/*------------------------------------------------- - monochrome_amber - 2-color black & amber --------------------------------------------------*/ - -void palette_device::palette_init_monochrome_amber(palette_device &palette) -{ - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0xf7, 0xaa, 0x00)); // amber -} - - -/*------------------------------------------------- - monochrome_green - 2-color black & green + monochrome - 2-color black & white -------------------------------------------------*/ -void palette_device::palette_init_monochrome_green(palette_device &palette) +void palette_device::palette_init_monochrome(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0x00, 0xff, 0x00)); // green + palette.set_pen_color(0, rgb_t::black); + palette.set_pen_color(1, rgb_t::white); } /*------------------------------------------------- - monochrome_green_highlight - 3-color black & green + monochrome_inverted - 2-color white & black -------------------------------------------------*/ -void palette_device::palette_init_monochrome_green_highlight(palette_device &palette) +void palette_device::palette_init_monochrome_inverted(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0x00, 0xc0, 0x00)); // green - palette.set_pen_color(2, rgb_t(0x00, 0xff, 0x00)); // green + palette.set_pen_color(0, rgb_t::white); + palette.set_pen_color(1, rgb_t::black); } /*------------------------------------------------- - monochrome_yellow - 2-color black & yellow + monochrome_highlight - 3-color -------------------------------------------------*/ -void palette_device::palette_init_monochrome_yellow(palette_device &palette) +void palette_device::palette_init_monochrome_highlight(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0xff, 0xff, 0x00)); // yellow + palette.set_pen_color(0, rgb_t::black); + palette.set_pen_color(1, rgb_t(0xc0, 0xc0, 0xc0)); + palette.set_pen_color(2, rgb_t::white); } |