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

[yuv422]

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:
e4a2aaf6fb DRAGONS: Fixed foreground transparency issue in library
8d5f2a7442 DRAGONS: Added support for using up and down keys during mini games


Commit: e4a2aaf6fbf07e82a4b9c3a4c719f789d04721b8
    https://github.com/scummvm/scummvm/commit/e4a2aaf6fbf07e82a4b9c3a4c719f789d04721b8
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-10T08:48:53+10:00

Commit Message:
DRAGONS: Fixed foreground transparency issue in library

Changed paths:
    engines/dragons/background.cpp


diff --git a/engines/dragons/background.cpp b/engines/dragons/background.cpp
index 19926035ee..9a13029259 100644
--- a/engines/dragons/background.cpp
+++ b/engines/dragons/background.cpp
@@ -91,9 +91,9 @@ Background::Background() : _priorityLayer(0), _points2(0), _data(0) {
 	_layerOffset[0] = Common::Point(0, 0);
 	_layerOffset[1] = Common::Point(0, 0);
 	_layerOffset[2] = Common::Point(0, 0);
-	_layerAlphaMode[0] = NORMAL;
-	_layerAlphaMode[1] = NORMAL;
-	_layerAlphaMode[2] = NORMAL;
+	_layerAlphaMode[0] = NONE;
+	_layerAlphaMode[1] = NONE;
+	_layerAlphaMode[2] = NONE;
 
 	_tileDataOffset = nullptr;
 }


Commit: 8d5f2a7442fbac8dd3d3c61c2a6f5796febbe201
    https://github.com/scummvm/scummvm/commit/8d5f2a7442fbac8dd3d3c61c2a6f5796febbe201
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-10T08:48:53+10:00

Commit Message:
DRAGONS: Added support for using up and down keys during mini games

Changed paths:
    engines/dragons/dragons.cpp
    engines/dragons/dragons.h


diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index ab2ee22364..523033223c 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -96,7 +96,9 @@ DragonsEngine::DragonsEngine(OSystem *syst, const ADGameDescription *desc) : Eng
 	_leftMouseButtonDown = false;
 	_rightMouseButtonUp = false;
 	_iKeyUp = false;
+	_downKeyDown = false;
 	_downKeyUp = false;
+	_upKeyDown = false;
 	_upKeyUp = false;
 	_enterKeyUp = false;
 	_leftKeyDown = false;
@@ -159,8 +161,10 @@ void DragonsEngine::updateEvents() {
 				_iKeyUp = true;
 			} else if (event.kbd.keycode == Common::KEYCODE_DOWN) {
 				_downKeyUp = true;
+				_downKeyDown = false;
 			} else if (event.kbd.keycode == Common::KEYCODE_UP) {
 				_upKeyUp = true;
+				_upKeyDown = false;
 			} else if (event.kbd.keycode == Common::KEYCODE_RETURN ||
 						event.kbd.keycode == Common::KEYCODE_KP_ENTER) {
 				_enterKeyUp = true;
@@ -189,6 +193,10 @@ void DragonsEngine::updateEvents() {
 				_leftKeyDown = true;
 			} else if (event.kbd.keycode == Common::KEYCODE_RIGHT) {
 				_rightKeyDown = true;
+			} else if (event.kbd.keycode == Common::KEYCODE_UP) {
+				_upKeyDown = true;
+			} else if (event.kbd.keycode == Common::KEYCODE_DOWN) {
+				_downKeyDown = true;
 			} else if (event.kbd.keycode == Common::KEYCODE_w) {
 				_wKeyDown = true;
 			} else if (event.kbd.keycode == Common::KEYCODE_a) {
@@ -1130,11 +1138,11 @@ bool DragonsEngine::isRightKeyPressed() {
 }
 
 bool DragonsEngine::isUpKeyPressed() {
-	return false; // TODO
+	return _upKeyDown;
 }
 
 bool DragonsEngine::isDownKeyPressed() {
-	return false; // TODO
+	return _downKeyDown;
 }
 
 bool DragonsEngine::checkForActionButtonRelease() {
diff --git a/engines/dragons/dragons.h b/engines/dragons/dragons.h
index 271709564d..4c1fadad0c 100644
--- a/engines/dragons/dragons.h
+++ b/engines/dragons/dragons.h
@@ -198,7 +198,9 @@ private:
 	bool _leftMouseButtonDown;
 	bool _rightMouseButtonUp;
 	bool _iKeyUp;
+	bool _downKeyDown;
 	bool _downKeyUp;
+	bool _upKeyDown;
 	bool _upKeyUp;
 	bool _enterKeyUp;