[Scummvm-git-logs] scummvm master -> 074b558e16e16f6cebddfbf0ca53c920901263e5

[sev-]

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:
c4111c9e32 STARTREK: Fix checking for the modifier keys
074b558e16 STARTREK: Attempt to fix compilation


Commit: c4111c9e32086f1fb7f546eaefeec867c64b5c3f
    https://github.com/scummvm/scummvm/commit/c4111c9e32086f1fb7f546eaefeec867c64b5c3f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-12-20T16:50:38+01:00

Commit Message:
STARTREK: Fix checking for the modifier keys

Changed paths:
    engines/startrek/awaymission.cpp


diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 340804b11a..71499f1c00 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -287,19 +287,19 @@ void StarTrekEngine::handleAwayMissionEvents() {
 				break;
 
 			case Common::KEYCODE_e:
-				if (event.kbd.flags && Common::KBD_CTRL) {
+				if (event.kbd.flags & Common::KBD_CTRL) {
 					_sound->toggleSfx();
 				}
 				break;
 
 			case Common::KEYCODE_m:
-				if (event.kbd.flags && Common::KBD_CTRL) {
+				if (event.kbd.flags & Common::KBD_CTRL) {
 					_sound->toggleMusic();
 				}
 				break;
 
 			case Common::KEYCODE_q:
-				if (event.kbd.flags && Common::KBD_CTRL) {
+				if (event.kbd.flags & Common::KBD_CTRL) {
 					showQuitGamePrompt(20, 20);
 				}
 				break;


Commit: 074b558e16e16f6cebddfbf0ca53c920901263e5
    https://github.com/scummvm/scummvm/commit/074b558e16e16f6cebddfbf0ca53c920901263e5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-12-20T17:00:09+01:00

Commit Message:
STARTREK: Attempt to fix compilation

Changed paths:
    engines/startrek/actors.cpp


diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index cc524f8fff..3483c467db 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -1001,7 +1001,7 @@ bool StarTrekEngine::walkActiveObjectToHotspot() {
 	else {
 		// If this action has code defined for it in this room, buffer the action to be
 		// done after the object finished walking there.
-		Action action = {_awayMission.activeAction, _awayMission.activeObject, 0, 0};
+		Action action = {static_cast<int8>(_awayMission.activeAction), _awayMission.activeObject, 0, 0};
 		if (_awayMission.activeAction == ACTION_USE)
 			action.b2 = _awayMission.passiveObject;