[Scummvm-git-logs] scummvm master -> 6b78f4a567114203809074deb7247f3d1b852e3c

[bgK]

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:
a7900f5756 MOHAWK: Riven: Stop sending empty rects when drawing transitions
6b78f4a567 MOHAWK: Riven: Set more variables when starting new games


Commit: a7900f57564df5bc0a3539a6a26ebed3c41e7435
    https://github.com/scummvm/scummvm/commit/a7900f57564df5bc0a3539a6a26ebed3c41e7435
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-07-15T07:23:58+02:00

Commit Message:
MOHAWK: Riven: Stop sending empty rects when drawing transitions

Fixes #9947.

Changed paths:
    engines/mohawk/riven_graphics.cpp


diff --git a/engines/mohawk/riven_graphics.cpp b/engines/mohawk/riven_graphics.cpp
index 6324af5..270b0c8 100644
--- a/engines/mohawk/riven_graphics.cpp
+++ b/engines/mohawk/riven_graphics.cpp
@@ -228,11 +228,15 @@ public:
 			}
 		}
 
-		_system->copyRectToScreen(_effectScreen->getBasePtr(oldX, oldY), _effectScreen->pitch,
-		                          oldArea.left, oldArea.top, oldArea.width(), oldArea.height());
+		if (!oldArea.isEmpty()) {
+			_system->copyRectToScreen(_effectScreen->getBasePtr(oldX, oldY), _effectScreen->pitch,
+			                          oldArea.left, oldArea.top, oldArea.width(), oldArea.height());
+		}
 
-		_system->copyRectToScreen(_mainScreen->getBasePtr(newX, newY), _mainScreen->pitch,
-		                          newArea.left, newArea.top, newArea.width(), newArea.height());
+		if (!newArea.isEmpty()) {
+			_system->copyRectToScreen(_mainScreen->getBasePtr(newX, newY), _mainScreen->pitch,
+			                          newArea.left, newArea.top, newArea.width(), newArea.height());
+		}
 
 		if (newArea == _rect) {
 			_effectScreen->copyRectToSurface(*_mainScreen, _rect.left, _rect.top, _rect);


Commit: 6b78f4a567114203809074deb7247f3d1b852e3c
    https://github.com/scummvm/scummvm/commit/6b78f4a567114203809074deb7247f3d1b852e3c
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-07-15T07:26:26+02:00

Commit Message:
MOHAWK: Riven: Set more variables when starting new games

Fixes #9960.

Changed paths:
    engines/mohawk/riven_vars.cpp


diff --git a/engines/mohawk/riven_vars.cpp b/engines/mohawk/riven_vars.cpp
index 093f491..e2166c9 100644
--- a/engines/mohawk/riven_vars.cpp
+++ b/engines/mohawk/riven_vars.cpp
@@ -290,6 +290,8 @@ void MohawkEngine_Riven::initVars() {
 	_vars["jbridge4"] = 1;
 	_vars["jgallows"] = 1;
 	_vars["jiconcorrectorder"] = 12068577;
+	_vars["jcrg"] = 1;
+	_vars["jwharkpos"] = 1;
 	_vars["bblrvalve"] = 1;
 	_vars["bblrwtr"] = 1;
 	_vars["bfans"] = 1;
@@ -298,6 +300,8 @@ void MohawkEngine_Riven::initVars() {
 	_vars["acathbook"] = 1;
 	_vars["bheat"] = 1;
 	_vars["blabpage"] = 1;
+	_vars["bidvlv"] = 1;
+	_vars["bvise"] = 1;
 	_vars["waterenabled"] = 1;
 	_vars["ogehnpage"] = 1;
 	_vars["bblrsw"] = 1;
@@ -306,6 +310,14 @@ void MohawkEngine_Riven::initVars() {
 	_vars["tdl"] = 1;
 	_vars["bmagcar"] = 1;
 	_vars["gnmagcar"] = 1;
+	_vars["gemagcar"] = 1;
+	_vars["gimagecurr"] = 1;
+	_vars["gimagemax"] = 1;
+	_vars["gimagerot"] = 1;
+	_vars["glkbridge"] = 1;
+	_vars["grviewpos"] = 2;
+	_vars["gpinpos"] = 1;
+	_vars["grviewmpos"] = 1617;
 	_vars["omusicplayer"] = 1;
 	_vars["transitionmode"] = kRivenTransitionModeFastest;
 	_vars["tdomeelev"] = 1;