[Scummvm-cvs-logs] scummvm master -> 71eedf9a3ebae5ba3c8bba075e4bc02fa5c474b2

[lukaslw]

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:
bb145b439d PRINCE: Silence signed and unsigned comparison warnings in gcc
71eedf9a3e PRINCE: Silence last comparison warning in gcc


Commit: bb145b439d1ed243d3968264a191fb9760d0b629
    https://github.com/scummvm/scummvm/commit/bb145b439d1ed243d3968264a191fb9760d0b629
Author: lukaslw (lukaslw at gmail.com)
Date: 2014-11-08T20:57:37+01:00

Commit Message:
PRINCE: Silence signed and unsigned comparison warnings in gcc

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



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index f0d3603..1c0198d 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1595,7 +1595,7 @@ void PrinceEngine::setBackAnim(Anim &backAnim) {
 }
 
 void PrinceEngine::showBackAnims() {
-	for (uint i = 0; i < kMaxBackAnims; i++) {
+	for (int i = 0; i < kMaxBackAnims; i++) {
 		BAS &seq = _backAnimList[i]._seq;
 		int activeSubAnim = seq._currRelative;
 		if (!_backAnimList[i].backAnims.empty()) {
@@ -4188,7 +4188,7 @@ int PrinceEngine::checkRightUpDir() {
 }
 
 bool PrinceEngine::tracePath(int x1, int y1, int x2, int y2) {
-	for (int i = 0; i < kPathBitmapLen; i++) {
+	for (uint i = 0; i < kPathBitmapLen; i++) {
 		_roomPathBitmapTemp[i] = 0;
 	}
 	if (x1 != x2 || y1 != y2) {
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index c9cb83d..6dce044 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -372,7 +372,7 @@ public:
 	static const int16 kZoomBitmapHeight = kMaxPicHeight / kZoomStep;
 	static const int16 kNormalWidth = 640;
 	static const int16 kNormalHeight = 480;
-	static const int32 kTransTableSize = 256 * 256;
+	static const uint32 kTransTableSize = 256 * 256;
 
 	static const int kMaxNormAnims = 64;
 	static const int kMaxBackAnims = 64;
@@ -408,7 +408,7 @@ public:
 	int _currentPointerNumber;
 
 	static const int16 kMaxInv = 90; // max amount of inventory items in whole game
-	static const int16 kMaxItems = 30; // size of inventory
+	static const uint16 kMaxItems = 30; // size of inventory
 
 	uint32 _invTxtSize;
 	byte *_invTxt;
@@ -537,7 +537,7 @@ public:
 
 	// Pathfinding
 	static const int16 kPathGridStep = 2;
-	static const int32 kPathBitmapLen = (kMaxPicHeight / kPathGridStep * kMaxPicWidth / kPathGridStep) / 8;
+	static const uint32 kPathBitmapLen = (kMaxPicHeight / kPathGridStep * kMaxPicWidth / kPathGridStep) / 8;
 	static const int32 kTracePts = 8000;
 	static const int32 kPBW = kMaxPicWidth / 16; // PathBitmapWidth
 	static const int kMinDistance = 2500;
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index deb52d7..1e50fe5 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -1629,7 +1629,7 @@ void Interpreter::O_BACKANIMRANGE() {
 }
 
 void Interpreter::O_CLEARPATH() {
-	for (int i = 0; i < _vm->kPathBitmapLen; i++) {
+	for (uint i = 0; i < _vm->kPathBitmapLen; i++) {
 		_vm->_roomPathBitmap[i] = 255;
 	}
 	debugInterpreter("O_CLEARPATH");


Commit: 71eedf9a3ebae5ba3c8bba075e4bc02fa5c474b2
    https://github.com/scummvm/scummvm/commit/71eedf9a3ebae5ba3c8bba075e4bc02fa5c474b2
Author: lukaslw (lukaslw at gmail.com)
Date: 2014-11-08T21:00:47+01:00

Commit Message:
PRINCE: Silence last comparison warning in gcc

Changed paths:
    engines/prince/script.h



diff --git a/engines/prince/script.h b/engines/prince/script.h
index 4799e84..23c0468 100644
--- a/engines/prince/script.h
+++ b/engines/prince/script.h
@@ -241,7 +241,7 @@ private:
 	typedef void (Interpreter::*OpcodeFunc)();
 	static OpcodeFunc _opcodes[];
 
-	static const int kGiveLetterScriptFix = 79002;
+	static const uint kGiveLetterScriptFix = 79002;
 
 	// Keep opcode handlers names as they are in original code
 	// making it easier to switch back and forth