[Scummvm-git-logs] scummvm master -> 815a0324d7533abe19ad70ab3cae040f7214431e

[whiterandrek]

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

Summary:
b7f408bb85 PETKA: fix show opcode
8e7425e16d PETKA: fix WalkVich opcode
815a0324d7 PETKA: fix WalkTo opcode


Commit: b7f408bb85869642bc8d21b9f3304196e5aeb853
    https://github.com/scummvm/scummvm/commit/b7f408bb85869642bc8d21b9f3304196e5aeb853
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-02T23:31:11+03:00

Commit Message:
PETKA: fix show opcode

Changed paths:
    engines/petka/objects/object.cpp


diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 73fb2ff92f..971863883c 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -145,7 +145,7 @@ void QMessageObject::processMessage(const QMessage &msg) {
 			g_vm->getQSystem()->getStar()->_isActive = msg.arg1;
 			break;
 		case kShow:
-			show(true);
+			show(msg.arg1);
 			break;
 		case kShake:
 			g_vm->videoSystem()->setShake(msg.arg1);


Commit: 8e7425e16dee5bb1c6d99780006ea30574efa6a8
    https://github.com/scummvm/scummvm/commit/8e7425e16dee5bb1c6d99780006ea30574efa6a8
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-02T23:49:16+03:00

Commit Message:
PETKA: fix WalkVich opcode

Changed paths:
    engines/petka/objects/object.cpp


diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 971863883c..9a5cfa34cd 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -223,13 +223,17 @@ void QMessageObject::processMessage(const QMessage &msg) {
 			}
 			break;
 		}
-		case kWalkVich:
-			if (msg.arg1 == 0xffff || msg.arg2 == -1) {
-				g_vm->getQSystem()->getChapay()->walk(msg.arg1, msg.arg2);
-			} else if (_walkX != -1) {
-				g_vm->getQSystem()->getChapay()->walk(_walkX, _walkY);
+		case kWalkVich: {
+			int destX = msg.arg1;
+			int destY = msg.arg2;
+			if (destX == -1 || destY  == -1) {
+				destX = _walkX;
+				destY = _walkY;
 			}
+			if (destX != -1)
+				g_vm->getQSystem()->getChapay()->walk(destX, destY);
 			break;
+		}
 		case kDescription: {
 			Common::ScopedPtr<Common::SeekableReadStream> invStream(g_vm->openFile("invntr.txt", true));
 			if (invStream) {


Commit: 815a0324d7533abe19ad70ab3cae040f7214431e
    https://github.com/scummvm/scummvm/commit/815a0324d7533abe19ad70ab3cae040f7214431e
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-02T23:50:13+03:00

Commit Message:
PETKA: fix WalkTo opcode

Changed paths:
    engines/petka/objects/object.cpp


diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 9a5cfa34cd..c5ad9fce87 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -215,7 +215,7 @@ void QMessageObject::processMessage(const QMessage &msg) {
 				if (r) {
 					for (uint i = 0; i < r->messages.size(); ++i) {
 						if (r->messages[i].opcode == kGoTo) {
-							g_vm->getQSystem()->getChapay()->walk(_walkX, _walkY);
+							g_vm->getQSystem()->getChapay()->walk(destX, destY);
 							break;
 						}
 					}