[Scummvm-cvs-logs] scummvm master -> 9d12a7181276c5f8eca043c84690ff2a1f767835

sev- sev at scummvm.org
Wed May 11 12:50:47 CEST 2016


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:
9d12a71812 SCUMM HE: Fix _fowImage data type


Commit: 9d12a7181276c5f8eca043c84690ff2a1f767835
    https://github.com/scummvm/scummvm/commit/9d12a7181276c5f8eca043c84690ff2a1f767835
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-11T12:50:59+02:00

Commit Message:
SCUMM HE: Fix _fowImage data type

Changed paths:
    engines/scumm/he/moonbase/moonbase.h
    engines/scumm/he/moonbase/moonbase_fow.cpp



diff --git a/engines/scumm/he/moonbase/moonbase.h b/engines/scumm/he/moonbase/moonbase.h
index 003467e..966112d 100644
--- a/engines/scumm/he/moonbase/moonbase.h
+++ b/engines/scumm/he/moonbase/moonbase.h
@@ -68,7 +68,7 @@ private:
 	int _fowTileW;
 	int _fowTileH;
 
-	byte *_fowImage;
+	uint8 *_fowImage;
 	int _fowClipX1;
 	int _fowClipY1;
 	int _fowClipX2;
diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index d7726e4..892ba29 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -106,7 +106,7 @@ bool Moonbase::setFOWImage(int image) {
 			Common::SeekableReadStream *stream = _exe.getResource(Common::kPERCData, resId);
 
 			if (stream->size()) {
-				_fowImage = (byte *)malloc(stream->size());
+				_fowImage = (uint8 *)malloc(stream->size());
 
 				stream->read(_fowImage, stream->size());
 			}






More information about the Scummvm-git-logs mailing list