diff options
| author | Lars Skovlund | 2011-01-24 11:17:47 +0000 |
|---|---|---|
| committer | Lars Skovlund | 2011-01-24 11:17:47 +0000 |
| commit | aa5e8e6c2bbd57bb183fd3c1f936b52767fe3941 (patch) | |
| tree | 7cf28482ff845c891902afb86046cc6c201be852 /engines/sci/graphics/robot.cpp | |
| parent | 3b61cb57d495a56933aed79f4d170180107b9c15 (diff) | |
| download | scummvm-rg350-aa5e8e6c2bbd57bb183fd3c1f936b52767fe3941.tar.gz scummvm-rg350-aa5e8e6c2bbd57bb183fd3c1f936b52767fe3941.tar.bz2 scummvm-rg350-aa5e8e6c2bbd57bb183fd3c1f936b52767fe3941.zip | |
SCI/Robot: Simplify ::setPalette()
svn-id: r55498
Diffstat (limited to 'engines/sci/graphics/robot.cpp')
| -rw-r--r-- | engines/sci/graphics/robot.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/graphics/robot.cpp b/engines/sci/graphics/robot.cpp index 70f50945e1..8cd82a8772 100644 --- a/engines/sci/graphics/robot.cpp +++ b/engines/sci/graphics/robot.cpp @@ -125,9 +125,7 @@ void GfxRobot::init(GuiResourceId resourceId, uint16 x, uint16 y) { } void GfxRobot::setPalette() { - byte *paletteData = (_hasSound && _audioSize > 14) ? - _resourceData + 60 + 14 + _audioSize : - _resourceData + 60; + byte *paletteData = _resourceData + _palOffset; uint16 paletteSize = READ_LE_UINT16(_resourceData + 16); Palette resourcePal; |