[Scummvm-git-logs] scummvm master -> 21e58455672605c27762f8e32299b0d773c20257
digitall
547637+digitall at users.noreply.github.com
Mon Jun 15 20:11:38 UTC 2020
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:
21e5845567 PETKA: Fix Signed vs. Unsigned Comparison Compiler Warnings
Commit: 21e58455672605c27762f8e32299b0d773c20257
https://github.com/scummvm/scummvm/commit/21e58455672605c27762f8e32299b0d773c20257
Author: D G Turner (digitall at scummvm.org)
Date: 2020-06-15T21:08:47+01:00
Commit Message:
PETKA: Fix Signed vs. Unsigned Comparison Compiler Warnings
Changed paths:
engines/petka/objects/heroes.cpp
engines/petka/objects/object.cpp
engines/petka/objects/object_case.cpp
engines/petka/objects/object_cursor.cpp
engines/petka/objects/object_star.cpp
diff --git a/engines/petka/objects/heroes.cpp b/engines/petka/objects/heroes.cpp
index c186cee354..c0fe784ff3 100644
--- a/engines/petka/objects/heroes.cpp
+++ b/engines/petka/objects/heroes.cpp
@@ -277,10 +277,10 @@ void QObjectPetka::update(int time) {
_startSound = true;
}
flc->setFrame(-1);
- if (flc->getCurFrame() == flc->getFrameCount() - 1) {
+ if (flc->getCurFrame() == (int32)flc->getFrameCount() - 1) {
g_vm->getQSystem()->addMessage(_id, kEnd, _resourceId, 0, 0, 0, 0);
}
- if (flc->getCurFrame() + 1 == flc->getFrameCount() / 2) {
+ if (flc->getCurFrame() + 1 == (int32)flc->getFrameCount() / 2) {
g_vm->getQSystem()->addMessage(_id, kHalf, _resourceId, 0, 0, 0, 0);
}
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 6b3ef0d3d2..0613a4c944 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -505,16 +505,16 @@ void QObject::update(int time) {
_time += time;
FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
if (flc && flc->getFrameCount() != 1) {
- while (_time >= flc->getDelay()) {
+ while (_time >= (int32)flc->getDelay()) {
if (_sound && flc->getCurFrame() == 0) {
_startSound = true;
}
g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), *flc);
flc->setFrame(-1);
- if (flc->getCurFrame() == flc->getFrameCount() - 1) {
+ if (flc->getCurFrame() == (int32)flc->getFrameCount() - 1) {
g_vm->getQSystem()->addMessage(_id, kEnd, _resourceId, 0, 0, 0, 0);
}
- if (flc->getCurFrame() + 1 == flc->getFrameCount() / 2) {
+ if (flc->getCurFrame() + 1 == (int32)flc->getFrameCount() / 2) {
g_vm->getQSystem()->addMessage(_id, kHalf, _resourceId, 0, 0, 0, 0);
}
_time -= flc->getDelay();
diff --git a/engines/petka/objects/object_case.cpp b/engines/petka/objects/object_case.cpp
index f8dc1c6064..00ee5ed767 100644
--- a/engines/petka/objects/object_case.cpp
+++ b/engines/petka/objects/object_case.cpp
@@ -86,7 +86,7 @@ void QObjectCase::update(int time) {
_time += time;
FlicDecoder *flc = g_vm->resMgr()->loadFlic(kFirstButtonResourceId + _clickedObjIndex);
if (flc) {
- while (_time >= flc->getDelay()) {
+ while (_time >= (int32)flc->getDelay()) {
flc->setFrame(-1);
_time -= flc->getDelay();
g_vm->videoSystem()->addDirtyMskRects(*flc);
diff --git a/engines/petka/objects/object_cursor.cpp b/engines/petka/objects/object_cursor.cpp
index 13c0a82edf..10cdb088c0 100644
--- a/engines/petka/objects/object_cursor.cpp
+++ b/engines/petka/objects/object_cursor.cpp
@@ -77,7 +77,7 @@ void QObjectCursor::update(int time) {
return;
FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
_time += time;
- while (flc && _time >= flc->getDelay()) {
+ while (flc && _time >= (int32)flc->getDelay()) {
flc->setFrame(-1);
g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), flc->getBounds());
_time -= flc->getDelay();
diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index ccb3c13640..4168254515 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -59,7 +59,7 @@ bool QObjectStar::isInPoint(Common::Point p) {
void QObjectStar::onMouseMove(Common::Point p) {
uint frame = (findButtonIndex(p.x - _x, p.y - _y) + 1) % 7 + 1;
FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
- if (flc && flc->getCurFrame() + 1 != frame) {
+ if (flc && flc->getCurFrame() + 1 != (int32)frame) {
g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), *flc);
flc->setFrame(frame);
}
More information about the Scummvm-git-logs
mailing list