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

sev- sev at scummvm.org
Fri Oct 10 14:39:07 CEST 2014


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

Summary:
44c90d31d7 PRINCE: Fix warning
430c271b87 PRINCE: Fix const'ness
30953f124f PRINCE: Fix variable sign
9c5eba6ffd PRINCE: Fix mask sign


Commit: 44c90d31d74cc6954d7c2efc49f4e6492085e357
    https://github.com/scummvm/scummvm/commit/44c90d31d74cc6954d7c2efc49f4e6492085e357
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:29:11+02: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 ae45be6..ea4869e 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1873,31 +1873,31 @@ void PrinceEngine::drawScreen() {
 
 void PrinceEngine::blackPalette() {
 	byte *paletteBackup = (byte *)malloc(256 * 3);
-	byte *blackPalette = (byte *)malloc(256 * 3);
+	byte *blackPalette1 = (byte *)malloc(256 * 3);
 
 	int fadeStep = kFadeStep - 1;
 	for (int i = 0; i < kFadeStep; i++) {
 		_system->getPaletteManager()->grabPalette(paletteBackup, 0, 256);
 		for (int j = 0; j < 256; j++) {
-			blackPalette[3 * j] = paletteBackup[3 * j] * fadeStep / 4;
-			blackPalette[3 * j + 1] = paletteBackup[3 * j + 1] * fadeStep / 4;
-			blackPalette[3 * j + 2] = paletteBackup[3 * j + 2] * fadeStep / 4;
+			blackPalette1[3 * j] = paletteBackup[3 * j] * fadeStep / 4;
+			blackPalette1[3 * j + 1] = paletteBackup[3 * j + 1] * fadeStep / 4;
+			blackPalette1[3 * j + 2] = paletteBackup[3 * j + 2] * fadeStep / 4;
 		}
 		fadeStep--;
-		_graph->setPalette(blackPalette);
+		_graph->setPalette(blackPalette1);
 		_system->updateScreen();
 		Common::Event event;
 		Common::EventManager *eventMan = _system->getEventManager();
 		eventMan->pollEvent(event);
 		if (shouldQuit()) {
 			free(paletteBackup);
-			free(blackPalette);
+			free(blackPalette1);
 			return;
 		}
 		pause();
 	}
 	free(paletteBackup);
-	free(blackPalette);
+	free(blackPalette1);
 }
 
 void PrinceEngine::setPalette(const byte *palette) {


Commit: 430c271b878ce4f5596ee4e8f2c07c432d5e7e17
    https://github.com/scummvm/scummvm/commit/430c271b878ce4f5596ee4e8f2c07c432d5e7e17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:34:14+02:00

Commit Message:
PRINCE: Fix const'ness

Changed paths:
    engines/prince/prince.cpp
    engines/prince/prince.h



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index ea4869e..fb6ba51 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1125,17 +1125,21 @@ int PrinceEngine::checkMob(Graphics::Surface *screen, Common::Array<Mob> &mobLis
 	return mobNumber;
 }
 
-void PrinceEngine::printAt(uint32 slot, uint8 color, char *s, uint16 x, uint16 y) {
+void PrinceEngine::printAt(uint32 slot, uint8 color, const char *s, uint16 x, uint16 y) {
 	debugC(1, DebugChannel::kEngine, "PrinceEngine::printAt slot %d, color %d, x %02d, y %02d, str %s", slot, color, x, y, s);
-	if (getLanguage() == Common::DE_DEU) {
-		correctStringDEU(s);
-	}
+
+	char tmpStr[1024];
+	strncpy(tmpStr, s, 1024);
+
+	if (getLanguage() == Common::DE_DEU)
+		correctStringDEU(tmpStr);
+
 	Text &text = _textSlots[slot];
-	text._str = s;
+	text._str = tmpStr;
 	text._x = x;
 	text._y = y;
 	text._color = color;
-	int lines = calcTextLines(s);
+	int lines = calcTextLines(tmpStr);
 	text._time = calcTextTime(lines);
 }
 
@@ -2469,7 +2473,7 @@ void PrinceEngine::inventoryLeftMouseButton() {
 		int invObjExamEvent = _script->scanMobEvents(_invMobList[_selectedMob]._mask, _script->_scriptInfo.invObjExam);
 		if (invObjExamEvent == -1) {
 			// do_standard
-			printAt(0, 216, (char *)_invMobList[_selectedMob]._examText.c_str(), kNormalWidth / 2, _invExamY);
+			printAt(0, 216, _invMobList[_selectedMob]._examText.c_str(), kNormalWidth / 2, _invExamY);
 			_interpreter->setCurrentString(_invMobList[_selectedMob]._mask + 70000);
 			setVoice(0, 28, 1);
 			playSample(28, 0);
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 9e892f1..e443ebd 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -308,7 +308,7 @@ public:
 	virtual GUI::Debugger *getDebugger();
 
 	void changeCursor(uint16 curId);
-	void printAt(uint32 slot, uint8 color, char *s, uint16 x, uint16 y);
+	void printAt(uint32 slot, uint8 color, const char *s, uint16 x, uint16 y);
 	int calcTextLines(const char *s);
 	int calcTextTime(int numberOfLines);
 	void correctStringDEU(char *s);


Commit: 30953f124f9af5d40c5868f38f692186ce90c287
    https://github.com/scummvm/scummvm/commit/30953f124f9af5d40c5868f38f692186ce90c287
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:35:13+02:00

Commit Message:
PRINCE: Fix variable sign

Changed paths:
    engines/prince/prince.cpp



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index fb6ba51..7aa4ef1 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -935,7 +935,7 @@ bool PrinceEngine::loadMobPriority(const char *resourceName) {
 	}
 
 	_mobPriorityList.clear();
-	int mobId;
+	uint mobId;
 	while (1) {
 		mobId = stream->readUint32LE();
 		if (mobId == 0xFFFFFFFF) {


Commit: 9c5eba6ffd09b639b9aa3b582c62101b0c7365d9
    https://github.com/scummvm/scummvm/commit/9c5eba6ffd09b639b9aa3b582c62101b0c7365d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:38:14+02:00

Commit Message:
PRINCE: Fix mask sign

Changed paths:
    engines/prince/prince.h
    engines/prince/script.cpp



diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index e443ebd..7143251b 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -185,7 +185,7 @@ enum AnimType {
 
 // Nak (PL - Nakladka)
 struct Mask {
-	int16 _state; // visible / invisible
+	uint16 _state; // visible / invisible
 	int16 _flags; // turning on / turning off of an mask
 	int16 _x1;
 	int16 _y1;
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index c675b6d..0e9dd27 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -371,7 +371,7 @@ bool Script::loadAllMasks(Common::Array<Mask> &maskList, int offset) {
 		Common::MemoryReadStream maskStream(_data, _dataSize);
 		maskStream.seek(offset);
 		tempMask._state = maskStream.readUint16LE();
-		if (tempMask._state == -1) {
+		if (tempMask._state == 0xffff) {
 			break;
 		}
 		tempMask._flags = maskStream.readUint16LE();






More information about the Scummvm-git-logs mailing list