diff options
| author | Paul Gilbert | 2010-05-25 11:54:18 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-05-25 11:54:18 +0000 |
| commit | 961a64a9f834a833e9ec7c060e8f81dddd91a3a3 (patch) | |
| tree | 8721fd98a1647ca2d50baa407891d5bc743895ba | |
| parent | 7bbbaf7d8cc382dd3c6dfc6dcaacf9c902523525 (diff) | |
| download | scummvm-rg350-961a64a9f834a833e9ec7c060e8f81dddd91a3a3.tar.gz scummvm-rg350-961a64a9f834a833e9ec7c060e8f81dddd91a3a3.tar.bz2 scummvm-rg350-961a64a9f834a833e9ec7c060e8f81dddd91a3a3.zip | |
Bugfix to allow timed text to display in the correct colours
svn-id: r49211
| -rw-r--r-- | engines/m4/mads_logic.cpp | 8 | ||||
| -rw-r--r-- | engines/m4/mads_scene.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/m4/mads_logic.cpp b/engines/m4/mads_logic.cpp index ee65d3be5c..4a361d92d2 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() { @@ -169,7 +169,9 @@ void MadsSceneLogic::setupScene() { // sub_1e754(animName, 3); - getSceneSpriteSet(); + if ((_sceneNumber >= 101) && (_sceneNumber <= 112)) + getSceneSpriteSet(); + getAnimName(); } diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp index 99c1249fde..60e480e6fb 100644 --- a/engines/m4/mads_scene.cpp +++ b/engines/m4/mads_scene.cpp @@ -78,7 +78,7 @@ void MadsScene::loadScene2(const char *aaName) { void MadsScene::loadSceneTemporary() { /* Existing code that eventually needs to be replaced with the proper MADS code */ // Set system palette entries - _vm->_palette->blockRange(0, 7); + _vm->_palette->blockRange(0, 18); RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0}, {0x00<<2, 0x10<<2, 0x16<<2, 0}}; _vm->_palette->setPalette(&sysColors[0], 4, 3); |