[Scummvm-cvs-logs] SF.net SVN: scummvm:[41440] scummvm/branches/gsoc2009-draci/engines/draci/ draci.cpp

[dkasak13 at users.sourceforge.net]

Revision: 41440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41440&view=rev
Author:   dkasak13
Date:     2009-06-10 21:28:16 +0000 (Wed, 10 Jun 2009)

Log Message:
-----------
Removed special-casing for the colour black as it's no longer needed.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-06-10 21:18:14 UTC (rev 41439)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-06-10 21:28:16 UTC (rev 41440)
@@ -113,26 +113,18 @@
 	ar.closeArchive();
 	ar.openArchive(path);
 	f = ar[0];
-	Common::MemoryReadStream readerZ(f->_data, f->_length);
+	Common::MemoryReadStream paletteReader(f->_data, f->_length);
 	
-	palette[0] = readerZ.readByte();
-	palette[1] = readerZ.readByte();
-	palette[2] = readerZ.readByte();
-	palette[3] = 0;
-	palette[4] = readerZ.readByte();
-	palette[5] = readerZ.readByte();
-	palette[6] = readerZ.readByte();
-	palette[7] = 0;
-	for (unsigned int i = 2; i < 256; ++i) {
-		palette[i * 4] = readerZ.readByte();
-		palette[i * 4 + 1] = readerZ.readByte();
-		palette[i * 4 + 2] = readerZ.readByte();
+	for (unsigned int i = 0; i < 256; ++i) {
+		palette[i * 4] = paletteReader.readByte();
+		palette[i * 4 + 1] = paletteReader.readByte();
+		palette[i * 4 + 2] = paletteReader.readByte();
 		palette[i * 4 + 3] = 0;
 	}
 
 	// Shift the palette one bit to the left to make it brighter
 	for (unsigned int i = 0; i < 4 * 256; ++i) {
-		palette[i] <<= 1;
+		palette[i] <<= 2;
 	} 
 
 	_system->setPalette(palette, 0, 256);


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