[Scummvm-git-logs] scummvm master -> 8ac07e4b626bf3b49b9cb96def2b3fb33db7d97f

[sev-]

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:
8ac07e4b62 PETKA: Fix more warnings


Commit: 8ac07e4b626bf3b49b9cb96def2b3fb33db7d97f
    https://github.com/scummvm/scummvm/commit/8ac07e4b626bf3b49b9cb96def2b3fb33db7d97f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-16T22:57:36+02:00

Commit Message:
PETKA: Fix more warnings

Changed paths:
    engines/petka/interfaces/main.cpp
    engines/petka/objects/object.cpp
    engines/petka/objects/object_case.cpp


diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index 0f2ead18a5..2b9e7b5a64 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -184,7 +184,7 @@ void InterfaceMain::onLeftButtonDown(const Common::Point p) {
 
 void InterfaceMain::onRightButtonDown(const Common::Point p) {
 	QObjectStar *star = g_vm->getQSystem()->_star.get();
-	QObjectCase *objCase = g_vm->getQSystem()->_case.get();
+	// QObjectCase *objCase = g_vm->getQSystem()->_case.get();
 	QObjectCursor *cursor = g_vm->getQSystem()->_cursor.get();
 	if (!star->_isActive)
 		return;
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index ba6e1628bd..36a3da0b75 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -131,9 +131,9 @@ void QMessageObject::processMessage(const QMessage &msg) {
 				break;
 			}
 			if (rMsg.opcode == kIf &&
-				(rMsg.arg1 == -1 || rMsg.arg1 != msg.arg1) &&
-				(rMsg.arg2 == -1 || rMsg.arg2 != msg.arg2) &&
-				(rMsg.arg3 == -1 || rMsg.arg3 != msg.arg3)) {
+			    (rMsg.arg1 == 0xffff || rMsg.arg1 != msg.arg1) &&
+			    (rMsg.arg2 == -1 || rMsg.arg2 != msg.arg2) &&
+			    (rMsg.arg3 == -1 || rMsg.arg3 != msg.arg3)) {
 				break;
 			}
 			if (rMsg.opcode == kRandom && rMsg.arg2 != -1) {
@@ -197,7 +197,7 @@ void QMessageObject::processMessage(const QMessage &msg) {
 			g_vm->getQSystem()->_mainInterface->_dialog.next(-1);
 			break;
 		case kCursor:
-			if (msg.arg1 == -1) {
+			if (msg.arg1 == 0xffff) {
 				g_vm->getQSystem()->_cursor->returnInvItem();
 				g_vm->getQSystem()->_cursor->_resourceId = 5002;
 				g_vm->getQSystem()->_cursor->_actionType = 0;
@@ -289,10 +289,10 @@ void QMessageObject::processMessage(const QMessage &msg) {
 			_isActive = false;
 			break;
 		case kJump:
-			g_vm->getQSystem()->_petka->setPos((msg.arg1 == -1 ? _walkX : msg.arg1), (msg.arg2 == -1 ? _walkY : msg.arg2));
+			g_vm->getQSystem()->_petka->setPos((msg.arg1 == 0xffff ? _walkX : msg.arg1), (msg.arg2 == -1 ? _walkY : msg.arg2));
 			break;
 		case kJumpVich:
-			g_vm->getQSystem()->_petka->setPos((msg.arg1 == -1 ? _walkX : msg.arg1), (msg.arg2 == -1 ? _walkY : msg.arg2));
+			g_vm->getQSystem()->_petka->setPos((msg.arg1 == 0xffff ? _walkX : msg.arg1), (msg.arg2 == -1 ? _walkY : msg.arg2));
 			break;
 		case kWalk:
 			if (!reacted) {
@@ -326,7 +326,7 @@ void QMessageObject::processMessage(const QMessage &msg) {
 			break;
 		}
 		case kWalkVich:
-			if (msg.arg1 == -1 || msg.arg2 == -1) {
+			if (msg.arg1 == 0xffff || msg.arg2 == -1) {
 				g_vm->getQSystem()->_chapayev->walk(msg.arg1, msg.arg2);
 			} else if (_walkX != -1) {
 				g_vm->getQSystem()->_chapayev->walk(_walkX, _walkY);
@@ -380,7 +380,7 @@ bool QObject::isInPoint(int x, int y) {
 		Common::Rect rect(_x, _y, _x + flc->getWidth(), _y + flc->getHeight());
 		if (!rect.contains(x, y))
 			return false;
-		return *(byte *) flc->getCurrentFrame()->getBasePtr(x - _x, y - _y) != 0;
+		return *(const byte *)flc->getCurrentFrame()->getBasePtr(x - _x, y - _y) != 0;
 	}
 	return false;
 }
@@ -515,4 +515,4 @@ void QObject::onClick(int x, int y) {
 	}
 }
 
-}
\ No newline at end of file
+}
diff --git a/engines/petka/objects/object_case.cpp b/engines/petka/objects/object_case.cpp
index 875452d35e..c4dfa9f600 100644
--- a/engines/petka/objects/object_case.cpp
+++ b/engines/petka/objects/object_case.cpp
@@ -94,9 +94,9 @@ bool QObjectCase::isInPoint(int x, int y) {
 
 void QObjectCase::onMouseMove(int x, int y) {
 	FlicDecoder *flc = g_vm->resMgr()->loadFlic(6009);
-	if (*(byte *)flc->getCurrentFrame()->getBasePtr(x - _x, y - _y) != 0) {
+	if (*(const byte *)flc->getCurrentFrame()->getBasePtr(x - _x, y - _y) != 0) {
 		if (_clickedObjIndex != 3 && _clickedObjIndex < 6 && _clickedObjIndex >= 0) {
-			FlicDecoder *flc = g_vm->resMgr()->loadFlic(6001 + _clickedObjIndex);
+			flc = g_vm->resMgr()->loadFlic(6001 + _clickedObjIndex);
 			flc->setFrame(1);
 			g_vm->videoSystem()->addDirtyRectFromMsk(Common::Point(0, 0), *flc);
 		}
@@ -104,14 +104,14 @@ void QObjectCase::onMouseMove(int x, int y) {
 	} else {
 		int i;
 		for (i = 0; i < 6; ++i) {
-			FlicDecoder *flc = g_vm->resMgr()->loadFlic(6001 + i);
+			flc = g_vm->resMgr()->loadFlic(6001 + i);
 			if (flc->getMskRects()[0].contains(Common::Point(x - _x, y))) {
 				break;
 			}
 		}
 
 		if (_clickedObjIndex != i && _clickedObjIndex < 6 && _clickedObjIndex >= 0) {
-			FlicDecoder *flc = g_vm->resMgr()->loadFlic(6001 + _clickedObjIndex);
+			flc = g_vm->resMgr()->loadFlic(6001 + _clickedObjIndex);
 			flc->setFrame(1);
 			g_vm->videoSystem()->addDirtyRectFromMsk(Common::Point(0, 0), *flc);
 		}
@@ -122,7 +122,7 @@ void QObjectCase::onMouseMove(int x, int y) {
 			}
 		} else if (i != _clickedObjIndex) {
 			if ((i || g_vm->getQSystem()->_chapayev->_isShown) && (i != 2 || g_vm->getQSystem()->_room->_showMap)) {
-				FlicDecoder *flc = g_vm->resMgr()->loadFlic(6001 + i);
+				flc = g_vm->resMgr()->loadFlic(6001 + i);
 				g_vm->videoSystem()->addDirtyRectFromMsk(Common::Point(0, 0), *flc);
 				_clickedObjIndex = i;
 			} else {