diff options
| author | Paul Gilbert | 2010-03-26 09:35:48 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-03-26 09:35:48 +0000 |
| commit | 02b1e3278a659db490c88e44540ea72bab32799c (patch) | |
| tree | 5ffd869406c3d3d7747cbabc152fa402fb49dba5 /engines/m4 | |
| parent | fcc7ab61ac3add71a127be0b503147fa8cc91d47 (diff) | |
| download | scummvm-rg350-02b1e3278a659db490c88e44540ea72bab32799c.tar.gz scummvm-rg350-02b1e3278a659db490c88e44540ea72bab32799c.tar.bz2 scummvm-rg350-02b1e3278a659db490c88e44540ea72bab32799c.zip | |
Bugfix for logic used to calculate single RGB palette entries
svn-id: r48403
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/m4/mads_logic.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp index 09072036fd..55dd6158bf 100644 --- a/engines/m4/graphics.cpp +++ b/engines/m4/graphics.cpp @@ -768,7 +768,7 @@ void Palette::grabPalette(byte *colors, uint start, uint num) { } void Palette::setEntry(uint index, uint8 r, uint8 g, uint8 b) { - uint32 c = (r << 16) | (g << 8) || b; + uint32 c = (r << 16) | (g << 8) | b; g_system->setPalette((const byte *)&c, index, 1); } diff --git a/engines/m4/mads_logic.cpp b/engines/m4/mads_logic.cpp index 5f6ccdb794..e69e8c38ca 100644 --- a/engines/m4/mads_logic.cpp +++ b/engines/m4/mads_logic.cpp @@ -59,8 +59,8 @@ void MadsSceneLogic::getSceneSpriteSet() { // if ((_sceneNumber == 105) ((_sceneNumber == 109) && (word_84800 != 0))) // _madsVm->globals()->playerSpriteChanged = true; - _vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF); - _vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4); +// _vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF); +// _vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4); } void MadsSceneLogic::getAnimName() { |