aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/prince/prince.cpp4
-rw-r--r--engines/prince/prince.h6
-rw-r--r--engines/prince/script.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index f0d360309c..1c0198d6f6 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 c9cb83d0b3..6dce044a41 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 deb52d7622..1e50fe5ec4 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");