From aa5e8e6c2bbd57bb183fd3c1f936b52767fe3941 Mon Sep 17 00:00:00 2001
From: Lars Skovlund
Date: Mon, 24 Jan 2011 11:17:47 +0000
Subject: SCI/Robot: Simplify ::setPalette()

svn-id: r55498
---
 engines/sci/graphics/robot.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/sci/graphics/robot.cpp')

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;
-- 
cgit v1.2.3