[Scummvm-git-logs] scummvm master -> 91f67a10ae3db0727db24b29eb5e53fb1b0212b5
peterkohaut
peterkohaut at users.noreply.github.com
Sat Aug 26 11:59:03 CEST 2017
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:
91f67a10ae BLADERUNNER: Transparent background in dialogue menu
Commit: 91f67a10ae3db0727db24b29eb5e53fb1b0212b5
https://github.com/scummvm/scummvm/commit/91f67a10ae3db0727db24b29eb5e53fb1b0212b5
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-08-26T11:58:14+02:00
Commit Message:
BLADERUNNER: Transparent background in dialogue menu
Changed paths:
engines/bladerunner/dialogue_menu.cpp
engines/bladerunner/dialogue_menu.h
diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp
index 40ec3ae..e13e69c 100644
--- a/engines/bladerunner/dialogue_menu.cpp
+++ b/engines/bladerunner/dialogue_menu.cpp
@@ -394,11 +394,17 @@ void DialogueMenu::reset() {
}
void DialogueMenu::darkenRect(Graphics::Surface &s, int x1, int y1, int x2, int y2) {
- for (int y = y1; y != y2; ++y) {
- for (int x = x1; x != x2; ++x) {
- // TODO(madmoose)
- uint16 *p = (uint16*)s.getBasePtr(x, y);
- *p = 0;
+ x1 = MAX(x1, 0);
+ y1 = MAX(y1, 0);
+ x2 = MIN(x2, 640);
+ y2 = MIN(y2, 480);
+
+ if (x1 < x2 && y1 < y2) {
+ for (int y = y1; y != y2; ++y) {
+ for (int x = x1; x != x2; ++x) {
+ uint16 *p = (uint16*)s.getBasePtr(x, y);
+ *p = (*p & 0x739C) >> 1; // 0 11100 11100 11100
+ }
}
}
}
diff --git a/engines/bladerunner/dialogue_menu.h b/engines/bladerunner/dialogue_menu.h
index 1ab90fd..61ddcf1 100644
--- a/engines/bladerunner/dialogue_menu.h
+++ b/engines/bladerunner/dialogue_menu.h
@@ -27,6 +27,7 @@
#include "common/array.h"
#include "common/str.h"
+
#include "graphics/surface.h"
namespace BladeRunner {
More information about the Scummvm-git-logs
mailing list