[Scummvm-cvs-logs] scummvm master -> 461d8f140ac70f8d24895c38d7d781d206e7e289

[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:
aaa858df00 WAGE: Made bounds calulation less restrictive
461d8f140a WAGE: Crash in Strange Disappearance has been resolved


Commit: aaa858df0005ae0aefe5bb049fcd156eb1060522
    https://github.com/scummvm/scummvm/commit/aaa858df0005ae0aefe5bb049fcd156eb1060522
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-14T07:51:37+01:00

Commit Message:
WAGE: Made bounds calulation less restrictive

Changed paths:
    engines/wage/design.cpp



diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 220acae..907a1ec 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -87,16 +87,14 @@ void Design::paint(Graphics::Surface *surface, Patterns &patterns, int x, int y)
 	bool needRender = false;
 
 	if (_surface == NULL) {
-		//_boundsCalculationMode = true;
+		_boundsCalculationMode = true;
 		_bounds->debugPrint(4, "Internal bounds:");
-		//_bounds->left = _bounds->top = 10000;
-		//_bounds->right =_bounds->bottom = -10000;
-		//render(patterns);
+		render(patterns);
 		_boundsCalculationMode = false;
 		if (_bounds->right == -10000) {
 			_bounds->left = _bounds->top = _bounds->right = _bounds->bottom = 0;
 		}
-		//_bounds->debugPrint(4, "Calculated bounds:");
+		_bounds->debugPrint(4, "Calculated bounds:");
 
 		_surface = new Graphics::Surface;
 		_surface->create(_bounds->width(), _bounds->height(), Graphics::PixelFormat::createFormatCLUT8());
@@ -201,9 +199,7 @@ bool Design::isPointOpaque(int x, int y) {
 }
 
 void Design::adjustBounds(int16 x, int16 y) {
-	_bounds->left   = MIN(x, _bounds->left);
 	_bounds->right  = MAX(x, _bounds->right);
-	_bounds->top    = MIN(y, _bounds->top);
 	_bounds->bottom = MAX(y, _bounds->bottom);
 }
 


Commit: 461d8f140ac70f8d24895c38d7d781d206e7e289
    https://github.com/scummvm/scummvm/commit/461d8f140ac70f8d24895c38d7d781d206e7e289
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-14T07:51:37+01:00

Commit Message:
WAGE: Crash in Strange Disappearance has been resolved

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 18ba897..7e22b2f 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -74,7 +74,6 @@ static const ADGameDescription gameDescriptions[] = {
 	// ??? problems with dog bitmap?
 	FANGAMEN("Space Adventure", "SpaceAdventure", "f9f3f1c419f56955f7966355b34ea5c8", 155356),
 	FANGAME("Star Trek", "44aaef4806578700429de5aaf95c266e", 53320),
-	// Crash in bitmap drawing on the first scene
 	FANGAME("Strange Disappearance", "d81f2d03a1e863f04fb1e3a5495b720e", 772282),
 	FANGAME("Time Bomb", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 64564),
 	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "595117cbed33e8de1ab3714b33880205", 231969),