[Scummvm-cvs-logs] scummvm master -> 3b9ac0318cdd35d645e2ae724dcddb5a3d018345

[sev-]

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

Summary:
522cd1c970 PRINCE: Fix warning
3b9ac0318c PRINCE: Fix variable sign


Commit: 522cd1c97082a7cae83b39877d4d33abc6770756
    https://github.com/scummvm/scummvm/commit/522cd1c97082a7cae83b39877d4d33abc6770756
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T09:30:21+01:00

Commit Message:
PRINCE: Fix warning

Changed paths:
    engines/prince/prince.cpp



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 17cef63..b0f2cd5 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1901,29 +1901,29 @@ void PrinceEngine::blackPalette() {
 
 void PrinceEngine::setPalette(const byte *palette) {
 	if (palette != nullptr) {
-		byte *blackPalette = (byte *)malloc(256 * 3);
+		byte *blackPalette_ = (byte *)malloc(256 * 3);
 		int fadeStep = 0;
 		for (int i = 0; i <= kFadeStep; i++) {
 			for (int j = 0; j < 256; j++) {
-				blackPalette[3 * j] = palette[3 * j] * fadeStep / 4;
-				blackPalette[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4;
-				blackPalette[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4;
+				blackPalette_[3 * j] = palette[3 * j] * fadeStep / 4;
+				blackPalette_[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4;
+				blackPalette_[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4;
 			}
 			fadeStep++;
-			_graph->setPalette(blackPalette);
+			_graph->setPalette(blackPalette_);
 			_system->updateScreen();
 			Common::Event event;
 			Common::EventManager *eventMan = _system->getEventManager();
 			eventMan->pollEvent(event);
 			if (shouldQuit()) {
 				_graph->setPalette(palette);
-				free(blackPalette);
+				free(blackPalette_);
 				return;
 			}
 			pause();
 		}
 		_graph->setPalette(palette);
-		free(blackPalette);
+		free(blackPalette_);
 	}
 }
 


Commit: 3b9ac0318cdd35d645e2ae724dcddb5a3d018345
    https://github.com/scummvm/scummvm/commit/3b9ac0318cdd35d645e2ae724dcddb5a3d018345
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T09:32:58+01:00

Commit Message:
PRINCE: Fix variable sign

Changed paths:
    engines/prince/script.cpp



diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 25249d3..71d003d 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -391,7 +391,7 @@ bool Script::loadAllMasks(Common::Array<Mask> &maskList, int offset) {
 			debug("Can't load %s", msStreamName.c_str());
 			delete msStream;
 		} else {
-			uint32 dataSize = msStream->size();
+			int32 dataSize = msStream->size();
 			if (dataSize != -1) {
 				tempMask._data = (byte *)malloc(dataSize);
 				if (msStream->read(tempMask._data, dataSize) != dataSize) {