[Scummvm-cvs-logs] scummvm master -> 6c09ab992eac45afbf3349f96f012b5b4a39b48e

[sev-]

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:
04bb80bc71 GUI: Fix regression
8ea64e923f SCUMM HE: Fix Moonbase FOW initialization
6c09ab992e SCUMM HE: Fix Moonbase FOW positioning


Commit: 04bb80bc7191069797edfcbb523439c805eef599
    https://github.com/scummvm/scummvm/commit/04bb80bc7191069797edfcbb523439c805eef599
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-06T18:43:36+02:00

Commit Message:
GUI: Fix regression

Changed paths:
    gui/ThemeEngine.cpp



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 5e2bbb0..0ed020e 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -865,7 +865,7 @@ void ThemeEngine::queueDD(DrawData type, const Common::Rect &r, uint32 dynamic,
 void ThemeEngine::queueDDText(TextData type, TextColor color, const Common::Rect &r, const Common::String &text, bool restoreBg,
                               bool ellipsis, Graphics::TextAlign alignH, TextAlignVertical alignV, int deltax, const Common::Rect &drawableTextArea) {
 
-	if (type != kTextDataNone || _texts[type] == 0)
+	if (type == kTextDataNone || _texts[type] == 0)
 		return;
 
 	Common::Rect area = r;


Commit: 8ea64e923f686c15f9454e4b23356d4eed2645b6
    https://github.com/scummvm/scummvm/commit/8ea64e923f686c15f9454e4b23356d4eed2645b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-06T18:52:11+02:00

Commit Message:
SCUMM HE: Fix Moonbase FOW initialization

Changed paths:
    engines/scumm/he/moonbase/moonbase_fow.cpp



diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 3f7356f..215e688 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -59,7 +59,7 @@ void Moonbase::initFOW() {
 
 	_fowBlackMode = true;
 
-	memset(_fowRenderTable, 0, 32768);
+	memset(_fowRenderTable, 0, sizeof(_fowRenderTable));
 }
 
 void Moonbase::releaseFOWResources() {


Commit: 6c09ab992eac45afbf3349f96f012b5b4a39b48e
    https://github.com/scummvm/scummvm/commit/6c09ab992eac45afbf3349f96f012b5b4a39b48e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-06T18:52:31+02:00

Commit Message:
SCUMM HE: Fix Moonbase FOW positioning

Changed paths:
    engines/scumm/he/moonbase/moonbase_fow.cpp



diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 215e688..b68d605 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -158,7 +158,7 @@ enum FOWElement {
 };
 
 int Moonbase::readFOWVisibilityArray(int array, int y, int x) {
-	if (readFromArray(array, y, x) > 0)
+	if (readFromArray(array, x, y) > 0)
 		return FOW_EMPTY;
 
 	return FOW_SOLID;