[Scummvm-cvs-logs] SF.net SVN: scummvm: [25948] scummvm/trunk/engines/parallaction/graphics. cpp

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sat Mar 3 11:01:45 CET 2007


Revision: 25948
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25948&view=rev
Author:   peres001
Date:     2007-03-03 02:01:43 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
loadBackground simplified: palette cycling is still broken, though

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/graphics.cpp

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-03-03 09:39:08 UTC (rev 25947)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-03-03 10:01:43 UTC (rev 25948)
@@ -1164,29 +1164,18 @@
 	if (!_vm->_archive.openArchivedFile(filename))
 		errorFileNotFound(filename);
 
-//	byte palette[PALETTE_SIZE];
-	byte v150[4];
 	_vm->_archive.read(_palette, PALETTE_SIZE);
-	_vm->_archive.read(&v150, 4);
 
-	byte tempfx[sizeof(PaletteFxRange)*6];
-	_vm->_archive.read(&tempfx, sizeof(PaletteFxRange)*6);
-
-//	setPalette(palette);
-
 	uint16 _si;
-	for (_si = 0; _si < 4; _si++) {
-		byte _al = v150[_si];
-		_bgLayers[_si] = _al;
-	}
+	for (_si = 0; _si < 4; _si++)
+		_bgLayers[_si] = _vm->_archive.readByte();
 
-	Common::MemoryReadStream sread(tempfx, sizeof(PaletteFxRange)*6);
 	for (_si = 0; _si < 6; _si++) {
-		_palettefx[_si]._timer = sread.readUint16BE();
-		_palettefx[_si]._step = sread.readUint16BE();
-		_palettefx[_si]._flags = sread.readUint16BE();
-		_palettefx[_si]._first = sread.readByte();
-		_palettefx[_si]._last = sread.readByte();
+		_palettefx[_si]._timer = _vm->_archive.readUint16BE();
+		_palettefx[_si]._step = _vm->_archive.readUint16BE();
+		_palettefx[_si]._flags = _vm->_archive.readUint16BE();
+		_palettefx[_si]._first = _vm->_archive.readByte();
+		_palettefx[_si]._last = _vm->_archive.readByte();
 	}
 
 #if 0


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




More information about the Scummvm-git-logs mailing list