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

sev- sev at scummvm.org
Tue Apr 12 20:02:32 CEST 2016


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5741915aa0 WAGE: Fix click target search order
01fb992097 WAGE: Redraw scene on object move to match original.
e2876f2910 WAGE: Fix console redrawing when desktop is redrawn
6cd76152a5 WAGE: Update game status


Commit: 5741915aa0ef202bf79275cb2386f261689d5d84
    https://github.com/scummvm/scummvm/commit/5741915aa0ef202bf79275cb2386f261689d5d84
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-12T19:24:59+02:00

Commit Message:
WAGE: Fix click target search order

Changed paths:
    engines/wage/gui.cpp



diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 93c799e..bd74855 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -588,12 +588,14 @@ Designed *Gui::mouseUp(int x, int y) {
 			_bordersDirty = true;
 		}
 
-		for (ObjList::const_iterator it = _scene->_objs.begin(); it != _scene->_objs.end(); ++it) {
+		for (ObjList::const_iterator it = _scene->_objs.end(); it != _scene->_objs.begin(); ) {
+			it--;
 			if ((*it)->_design->isPointOpaque(x - _sceneArea.left + kBorderWidth, y - _sceneArea.top + kBorderWidth))
 				return *it;
 		}
 
-		for (ChrList::const_iterator it = _scene->_chrs.begin(); it != _scene->_chrs.end(); ++it) {
+		for (ChrList::const_iterator it = _scene->_chrs.end(); it != _scene->_chrs.begin(); ) {
+			it--;
 			if ((*it)->_design->isPointOpaque(x - _sceneArea.left + kBorderWidth, y - _sceneArea.top + kBorderWidth))
 				return *it;
 		}


Commit: 01fb992097e525cfd2932e942d7b52dbb3bc3a5d
    https://github.com/scummvm/scummvm/commit/01fb992097e525cfd2932e942d7b52dbb3bc3a5d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-12T19:43:43+02:00

Commit Message:
WAGE: Redraw scene on object move to match original.

Still buggy a bit

Changed paths:
    engines/wage/wage.cpp



diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index aa480b6..3a52aed 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -388,6 +388,7 @@ void WageEngine::onMove(Designed *what, Designed *from, Designed *to) {
 	if (!_temporarilyHidden) {
 		if (to == currentScene || from == currentScene) {
 			redrawScene();
+			g_system->updateScreen();
 			g_system->delayMillis(100);
 		}
 	}
@@ -399,6 +400,7 @@ void WageEngine::redrawScene() {
 	if (currentScene != NULL) {
 		bool firstTime = (_lastScene != currentScene);
 
+		_gui->draw();
 		updateSoundTimerForScene(currentScene, firstTime);
 	}
 }


Commit: e2876f2910ec64bfb8dc83d9d81a4b05c39c9675
    https://github.com/scummvm/scummvm/commit/e2876f2910ec64bfb8dc83d9d81a4b05c39c9675
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-12T19:45:54+02:00

Commit Message:
WAGE: Fix console redrawing when desktop is redrawn

Changed paths:
    engines/wage/gui.cpp



diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index bd74855..ae4995a 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -297,7 +297,7 @@ void Gui::drawScene() {
 
 // Render console
 void Gui::drawConsole() {
-	if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty)
+	if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty && !_sceneDirty)
 		return;
 
 	renderConsole(&_screen, _consoleTextArea);


Commit: 6cd76152a554bdffb832e409183fbd6b0fd7bcb3
    https://github.com/scummvm/scummvm/commit/6cd76152a554bdffb832e409183fbd6b0fd7bcb3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-12T20:02:05+02:00

Commit Message:
WAGE: Update game status

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 0963386..59d93cc 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -36,13 +36,12 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("3rd Floor", "3ed49d2163e46d2c9b33fd80927d9e22", 281423), // alt version
 	BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "abc7188469a9a7083fd4caec55a4f76e", 1420723),
 	BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "6b59e5bb9a4b74ecdd9f66d4e36a59cf", 1843104),
-	// No Next on the first screen?
+	// Crash on third screen
 	FANGAME("Brownie's Dream", "6fdcce532bcd50b7e4f3f6bab50a0ee6", 440704),
 	FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "55842a100b56e236c5ad69563e01fc24", 471589),
 	FANGAME("Bug Hunt", "738e2e8a1020be48c5ef42da571674ae", 195699),
 	FANGAME("Bug Hunt", "118a41121143488719d28daa9af8cd39", 195779), // alt version
 	BIGGAME("cantitoe", "", "Camp Cantitoe", "1780c41d14b876461a19dbeceebf2a37", 616985),
-	// Problems with letter rendering
 	FANGAME("Canal District", "34e7a8e84b33ba8ea38b4ffd76ef074f", 641470),
 	FANGAME("Carbon Copy", "9e781acd63290ae390d515cffc742011", 519445),
 	// Invalid rect in scene "FINALE"






More information about the Scummvm-git-logs mailing list