diff options
| author | Travis Howell | 2006-04-16 10:12:33 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-16 10:12:33 +0000 |
| commit | cadafb0689fc96fc77f09dc70b4b32cc8c572714 (patch) | |
| tree | 321c88defe108ab2c370845f7e0bac6a632635d9 /engines/simon/items.cpp | |
| parent | 26736f9a67ef56559fcca542b1bfecd057d803cc (diff) | |
| download | scummvm-rg350-cadafb0689fc96fc77f09dc70b4b32cc8c572714.tar.gz scummvm-rg350-cadafb0689fc96fc77f09dc70b4b32cc8c572714.tar.bz2 scummvm-rg350-cadafb0689fc96fc77f09dc70b4b32cc8c572714.zip | |
Fix cursor colors in chemsitry set for FF
svn-id: r21933
Diffstat (limited to 'engines/simon/items.cpp')
| -rw-r--r-- | engines/simon/items.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index e4437e8a55..aed8157bad 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1314,12 +1314,15 @@ void SimonEngine::o_screenTextMsg() { void SimonEngine::o_playEffect() { // 163: play sound - uint sound_id = getVarOrWord(); + uint soundId = getVarOrWord(); + + if (getGameType() == GType_FF) + error("o_playEffect: triggered"); if (getGameId() == GID_SIMON1DOS) - playSting(sound_id); + playSting(soundId); else - _sound->playEffects(sound_id); + _sound->playEffects(soundId); } void SimonEngine::o_getDollar2() { @@ -1977,16 +1980,16 @@ void SimonEngine::o3_restartClock() { void SimonEngine::o3_setColour() { // 195: set palette colour - uint b = getVarOrByte(); - uint g = getVarOrByte(); - uint r = getVarOrByte(); uint c = getVarOrByte() * 4; + uint r = getVarOrByte(); + uint g = getVarOrByte(); + uint b = getVarOrByte(); - _palette[c + 0] = _paletteBackup[c + 0] = r; - _palette[c + 1] = _paletteBackup[c + 1] = g; - _palette[c + 2] = _paletteBackup[c + 2] = b; + _palette[c + 0] = r; + _palette[c + 1] = g; + _palette[c + 2] = b; - debug(0, "o3_setColour (%d, %d, %d, %d)", c, r, g, b); + _paletteFlag = 2; } void SimonEngine::o3_b3Set() { |