aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/user_interface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-25 21:20:44 -0400
committerPaul Gilbert2014-03-25 21:20:44 -0400
commite9977e81d0c3ab13d934755e37a93f62b78a65cb (patch)
tree849ae723c9c5ec26e479358dc4679687e2e16460 /engines/mads/user_interface.cpp
parent633da299f694a9998a0cdb002a08613750f36e61 (diff)
downloadscummvm-rg350-e9977e81d0c3ab13d934755e37a93f62b78a65cb.tar.gz
scummvm-rg350-e9977e81d0c3ab13d934755e37a93f62b78a65cb.tar.bz2
scummvm-rg350-e9977e81d0c3ab13d934755e37a93f62b78a65cb.zip
MADS: Fixes and cleanup for palette loading
Diffstat (limited to 'engines/mads/user_interface.cpp')
-rw-r--r--engines/mads/user_interface.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index b45ff14633..05e9b70432 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -224,11 +224,12 @@ void UserInterface::load(const Common::String &resName) {
byte *palP = &_vm->_palette->_mainPalette[0];
for (int i = 0; i < 16; ++i, gamePalP++, palP += 3) {
- palP[0] = VGA_COLOR_TRANS(palStream->readByte());
- palP[1] = VGA_COLOR_TRANS(palStream->readByte());
- palP[2] = VGA_COLOR_TRANS(palStream->readByte());
+ RGB6 rgb;
+ rgb.load(palStream);
+ palP[0] = rgb.r;
+ palP[1] = rgb.g;
+ palP[2] = rgb.b;
*gamePalP |= 1;
- palStream->skip(3);
}
delete palStream;