[Scummvm-cvs-logs] scummvm master -> e5698d123d8c40aa43ca095d0d191b4c8af786fa

[dreammaster]

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:
5cbf6347d1 TSAGE: Fixed problem in pathfinding when clicked position is outside walkable areas
e5698d123d TSAGE: Removed hack from Scene #5200 now that pathfinding has been fixed


Commit: 5cbf6347d1af9aaf58a0aea1bd656e5813885a3a
    https://github.com/scummvm/scummvm/commit/5cbf6347d1af9aaf58a0aea1bd656e5813885a3a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-29T23:31:09-07:00

Commit Message:
TSAGE: Fixed problem in pathfinding when clicked position is outside walkable areas

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 770b091..997e8e2 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3310,7 +3310,7 @@ void WalkRegions::loadRevised() {
  */
 int WalkRegions::indexOf(const Common::Point &pt, const Common::List<int> *indexList) {
 	for (uint idx = 0; idx < _regionList.size(); ++idx) {
-		if ((!indexList || contains(*indexList, int(idx + 1))) && _regionList[idx].contains(pt))
+		if ((!indexList || !contains(*indexList, int(idx + 1))) && _regionList[idx].contains(pt))
 			return idx + 1;
 	}
 


Commit: e5698d123d8c40aa43ca095d0d191b4c8af786fa
    https://github.com/scummvm/scummvm/commit/e5698d123d8c40aa43ca095d0d191b4c8af786fa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-29T23:35:17-07:00

Commit Message:
TSAGE: Removed hack from Scene #5200 now that pathfinding has been fixed

Changed paths:
    engines/tsage/ringworld_scenes6.cpp



diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index ac17781..affc9cb 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1493,13 +1493,6 @@ void Scene5200::Action2::signal() {
 	case 5:
 		_globals->_player.enableControl();
 		remove();
-
-		// HACK: Change scene here. Basically, perform the code that's
-		// in Scene5200::dispatch(), as PlayerMover::proc1() gets stuck
-		// when exiting the scene via the right exit
-		_globals->_stripNum = 5200;
-		_globals->_sceneManager.changeScene(5100);
-
 		break;
 	}
 }