[Scummvm-cvs-logs] SF.net SVN: scummvm:[55498] scummvm/trunk/engines/sci/graphics/robot.cpp

[lskovlun at users.sourceforge.net]

Revision: 55498
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55498&view=rev
Author:   lskovlun
Date:     2011-01-24 11:17:47 +0000 (Mon, 24 Jan 2011)

Log Message:
-----------
SCI/Robot: Simplify ::setPalette()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/robot.cpp

Modified: scummvm/trunk/engines/sci/graphics/robot.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/robot.cpp	2011-01-24 10:57:19 UTC (rev 55497)
+++ scummvm/trunk/engines/sci/graphics/robot.cpp	2011-01-24 11:17:47 UTC (rev 55498)
@@ -125,9 +125,7 @@
 }
 
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.