[Scummvm-cvs-logs] scummvm master -> 03e7fd3941204b10b74d92d3724899e8529775f1

dreammaster dreammaster at scummvm.org
Tue Nov 19 15:03:22 CET 2013


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:
40a936dd11 TSAGE: R2R fix for using ladder at bottom of lift shaft
03e7fd3941 TSAGE: Graphic fix for image flags affecting frame centroid location


Commit: 40a936dd112eb8ddd80bc08ffe2c89af23248153
    https://github.com/scummvm/scummvm/commit/40a936dd112eb8ddd80bc08ffe2c89af23248153
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-19T06:01:52-08:00

Commit Message:
TSAGE: R2R fix for using ladder at bottom of lift shaft

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index eaa60ca..03a4d1d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -13350,7 +13350,8 @@ bool Scene1945::Ladder::startAction(CursorType action, Event &event) {
 	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
 		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
 		scene->_sceneMode = 1947;
-	} else if ((R2_GLOBALS._player._position.x == 221) && (R2_GLOBALS._player._position.y == 142) && (event.mousePos.y >= 30)) {
+	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50) 
+			&& (event.mousePos.y >= 30)) {
 		scene->_sceneMode = 1940;
 	} else {
 		R2_GLOBALS._player.enableControl(CURSOR_USE);
@@ -13551,6 +13552,7 @@ void Scene1945::signal() {
 			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_gunpowder, NULL);
 			return;
 		}
+		_sceneMode = 0;
 		break;
 	case 1947:
 		if (_nextSceneMode1 == 1943) {


Commit: 03e7fd3941204b10b74d92d3724899e8529775f1
    https://github.com/scummvm/scummvm/commit/03e7fd3941204b10b74d92d3724899e8529775f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-19T06:02:41-08:00

Commit Message:
TSAGE: Graphic fix for image flags affecting frame centroid location

Changed paths:
    engines/tsage/graphics.cpp



diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 595c43a..446c566 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -68,11 +68,21 @@ GfxSurface surfaceFromRes(const byte *imgData) {
 	Rect r(0, 0, READ_LE_UINT16(imgData), READ_LE_UINT16(imgData + 2));
 	GfxSurface s;
 	s.create(r.width(), r.height());
+	s._transColor = *(imgData + 8);
+
+	byte flags = imgData[9];
+	bool rleEncoded = (flags & 2) != 0;
+
+	// Figure out the centroid
 	s._centroid.x = READ_LE_UINT16(imgData + 4);
 	s._centroid.y = READ_LE_UINT16(imgData + 6);
-	s._transColor = *(imgData + 8);
 
-	bool rleEncoded = (imgData[9] & 2) != 0;
+	if (g_vm->getGameID() != GType_Ringworld) {
+		if (flags & 4)
+			s._centroid.x = r.width() - (s._centroid.x + 1);
+		if (flags & 8)
+			s._centroid.y = r.height() - (s._centroid.y + 1);
+	}
 
 	const byte *srcP = imgData + 10;
 	Graphics::Surface destSurface = s.lockSurface();






More information about the Scummvm-git-logs mailing list