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

dreammaster dreammaster at scummvm.org
Sat Apr 30 08:42:14 CEST 2011


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:
9fc1ed2c60 TSAGE: Added a print out of region details to the walk_regions debugger command
c08fc15cbe TSAGE: Fix for GUI dialog appearing when clicking on some hotspots in Scene #5200


Commit: 9fc1ed2c6059e68ebf857a646b767de7811e0f00
    https://github.com/scummvm/scummvm/commit/9fc1ed2c6059e68ebf857a646b767de7811e0f00
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-29T23:40:01-07:00

Commit Message:
TSAGE: Added a print out of region details to the walk_regions debugger command

Changed paths:
    engines/tsage/debugger.cpp



diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index c50a4f5..eecc844 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -92,6 +92,8 @@ bool Debugger::Cmd_WalkRegions(int argc, const char **argv) {
 	Graphics::Surface destSurface = _globals->_sceneManager._scene->_backSurface.lockSurface();
 
 	// Loop through drawing each walk region in a different color to the background surface
+	Common::String regionsDesc;
+
 	for (uint regionIndex = 0; regionIndex < _globals->_walkRegions._regionList.size(); ++regionIndex, ++color) {
 		WalkRegion &wr = _globals->_walkRegions._regionList[regionIndex];
 
@@ -102,6 +104,9 @@ bool Debugger::Cmd_WalkRegions(int argc, const char **argv) {
 				destSurface.hLine(sliceSet.items[idx].xs - _globals->_sceneOffset.x, yp,
 				sliceSet.items[idx].xe - _globals->_sceneOffset.x, color);
 		}
+
+		regionsDesc += Common::String::format("Region #%d d bounds=%d,%d,%d,%d\n",
+					regionIndex, wr._bounds.left, wr._bounds.top, wr._bounds.right, wr._bounds.bottom);
 	}
 
 	// Release the surface
@@ -110,6 +115,9 @@ bool Debugger::Cmd_WalkRegions(int argc, const char **argv) {
 	// Mark the scene as requiring a full redraw
 	_globals->_paneRefreshFlag[0] = 2;
 
+	DebugPrintf("Total regions = %d\n", _globals->_walkRegions._regionList.size());
+	DebugPrintf("%s\n", regionsDesc.c_str());
+
 	return false;
 }
 
@@ -383,7 +391,7 @@ bool Debugger::Cmd_MoveObject(int argc, const char **argv) {
  * Give a specified item to the player
  */
 bool Debugger::Cmd_Item(int argc, const char **argv) {
-	RING_INVENTORY._infoDisk._sceneNumber = 1;
+	RING_INVENTORY._stasisBox._sceneNumber = 1;
 	return true;
 }
 


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

Commit Message:
TSAGE: Fix for GUI dialog appearing when clicking on some hotspots in Scene #5200

Changed paths:
    engines/tsage/ringworld_scenes6.cpp
    engines/tsage/ringworld_scenes6.h



diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index affc9cb..774d83b 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1574,7 +1574,7 @@ void Scene5200::Hotspot10::doAction(int action) {
 		}
 		break;
 	default:
-		SceneItem::doAction(action);
+		SceneObject::doAction(action);
 		break;
 	}
 }
@@ -1590,7 +1590,7 @@ void Scene5200::Hotspot14::doAction(int action) {
 		scene->setAction(&scene->_action2);
 		break;
 	default:
-		SceneItem::doAction(action);
+		SceneObject::doAction(action);
 		break;
 	}
 }
diff --git a/engines/tsage/ringworld_scenes6.h b/engines/tsage/ringworld_scenes6.h
index 272aea4..16b2800 100644
--- a/engines/tsage/ringworld_scenes6.h
+++ b/engines/tsage/ringworld_scenes6.h
@@ -216,11 +216,11 @@ class Scene5200 : public Scene {
 	};
 
 	/* Hotspots */
-	class Hotspot9 : public SceneItemExt {
+	class Hotspot9 : public SceneObjectExt {
 	public:
 		virtual void doAction(int action);
 	};
-	class Hotspot10 : public SceneItemExt {
+	class Hotspot10 : public SceneObjectExt {
 	public:
 		virtual void doAction(int action);
 	};






More information about the Scummvm-git-logs mailing list