[Scummvm-cvs-logs] scummvm master -> 55f1fa8dba78c6c11365b98b358d249209db99fc

[dreammaster]

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

Summary:
55f1fa8dba TSAGE: Bugfixes for graphics glitches when using the lift in scene #2320


Commit: 55f1fa8dba78c6c11365b98b358d249209db99fc
    https://github.com/scummvm/scummvm/commit/55f1fa8dba78c6c11365b98b358d249209db99fc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-19T02:18:34-07:00

Commit Message:
TSAGE: Bugfixes for graphics glitches when using the lift in scene #2320

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/ringworld_scenes3.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 2d0a69f..ba4c592 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2388,8 +2388,8 @@ void SceneObjectList::draw() {
 
 			// Handle updating object priority
 			if (!(obj->_flags & OBJFLAG_FIXED_PRIORITY)) {
-				obj->_priority = MIN((int)obj->_position.y - 1,
-					(int)_globals->_sceneManager._scene->_backgroundBounds.bottom);
+				obj->_priority = MIN((int)obj->_position.y,
+					(int)_globals->_sceneManager._scene->_backgroundBounds.bottom - 1);
 			}
 
 			if ((_globals->_paneRefreshFlag[paneNum] != 0) || !_globals->_paneRegions[paneNum].empty()) {
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 1571f18..bd276a8 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -5068,7 +5068,7 @@ void Scene2320::Action3::signal() {
 		break;
 	}
 	case 3:
-		scene->_hotspot6.setPriority2(scene->_hotspot6._priority - 1);
+		_globals->_player.setPriority2(scene->_hotspot6._priority - 1);
 		_globals->_player._strip = 3;
 		setDelay(10);
 		break;
@@ -5798,7 +5798,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) {
 		_globals->_sceneItems.push_back(&_hotspot8);
 	}
 
-	_area1.setup(2100, 2, 1, 2100);
+	_area1.setup(2153, 2, 1, 2100);
 	_area1._pt = Common::Point(200, 31);
 	_area2.setup(2153, 3, 1, 2150);
 	_area2._pt = Common::Point(200, 50);