[Scummvm-cvs-logs] scummvm master -> a92528636193220d29dcc75e5b4899a1e80cfa5f

digitall digitall at scummvm.org
Sun Feb 20 07:13:38 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a925286361 COMMON: Correct NE Resource Loader for Osystem RGBA->RGB Palette Change.


Commit: a92528636193220d29dcc75e5b4899a1e80cfa5f
    https://github.com/scummvm/scummvm/commit/a92528636193220d29dcc75e5b4899a1e80cfa5f
Author: D G Turner (digitall at scummvm.org)
Date: 2011-02-19T22:12:21-08:00

Commit Message:
COMMON: Correct NE Resource Loader for Osystem RGBA->RGB Palette Change.

Changed paths:
    common/ne_exe.cpp
    common/ne_exe.h



diff --git a/common/ne_exe.cpp b/common/ne_exe.cpp
index a216ef6..34bb551 100644
--- a/common/ne_exe.cpp
+++ b/common/ne_exe.cpp
@@ -38,7 +38,7 @@ NECursor::NECursor() {
 	_hotspotX = 0;
 	_hotspotY = 0;
 	_surface  = 0;
-	memset(_palette, 0, 256 * 4);
+	memset(_palette, 0, 256 * 3);
 }
 
 NECursor::~NECursor() {
@@ -121,16 +121,16 @@ bool NECursor::readCursor(SeekableReadStream &stream, uint32 count) {
 	height /= 2;
 
 	// Standard palette: transparent, black, white
+	_palette[6] = 0xff;
+	_palette[7] = 0xff;
 	_palette[8] = 0xff;
-	_palette[9] = 0xff;
-	_palette[10] = 0xff;
 
 	// Reading the palette
 	bitmap->seek(40);
 	for (uint32 i = 0 ; i < numColors; i++) {
-		_palette[(i + 1) * 4 + 2] = bitmap->readByte();
-		_palette[(i + 1) * 4 + 1] = bitmap->readByte();
-		_palette[(i + 1) * 4 + 0] = bitmap->readByte();
+		_palette[(i + 1) * 3 + 2] = bitmap->readByte();
+		_palette[(i + 1) * 3 + 1] = bitmap->readByte();
+		_palette[(i + 1) * 3 + 0] = bitmap->readByte();
 		bitmap->readByte();
 	}
 
diff --git a/common/ne_exe.h b/common/ne_exe.h
index ac080d8..545c8e5 100644
--- a/common/ne_exe.h
+++ b/common/ne_exe.h
@@ -63,7 +63,7 @@ public:
 
 private:
 	byte *_surface;
-	byte _palette[256 * 4];
+	byte _palette[256 * 3];
 
 	uint16 _width;    ///< The cursor's width.
 	uint16 _height;   ///< The cursor's height.






More information about the Scummvm-git-logs mailing list