aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/m4/graphics.cpp2
-rw-r--r--engines/m4/mads_logic.cpp4
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() {