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

[dreammaster]

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

Summary:
4a64e928cf TSAGE: Add missing dispatch method to fix getting shot too quickly in Scene #40
471815e00c TSAGE: Fix base hotspot classes of hotspots in Scene #40
f482e25f2a TSAGE: Fix call to correct base class in Scene #60 items


Commit: 4a64e928cf07e8333312a5d74a72034d56aee2fe
    https://github.com/scummvm/scummvm/commit/4a64e928cf07e8333312a5d74a72034d56aee2fe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-07-29T15:56:16-07:00

Commit Message:
TSAGE: Add missing dispatch method to fix getting shot too quickly in Scene #40

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



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 8299a05..6a82ca7 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -1330,6 +1330,24 @@ void Scene40::Action8::signal() {
 	}
 }
 
+void Scene40::Action8::dispatch() {
+	if (_action)
+		_action->dispatch();
+
+	if (_delayFrames) {
+		uint32 frameNumber = _globals->_events.getFrameNumber();
+		if ((_startFrame + 60) < frameNumber) {
+			--_delayFrames;
+			_startFrame = frameNumber;
+
+			if (_delayFrames <= 0) {
+				_delayFrames = 0;
+				signal();
+			}
+		}
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 void Scene40::DyingKzin::doAction(int action) {
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 283cf68..229dfc7 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -201,6 +201,7 @@ class Scene40 : public Scene {
 	class Action8 : public Action {
 	public:
 		virtual void signal();
+		virtual void dispatch();
 	};
 
 	/* Objects */


Commit: 471815e00c2d5190067d4063d500d1fa9cc0973b
    https://github.com/scummvm/scummvm/commit/471815e00c2d5190067d4063d500d1fa9cc0973b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-07-29T16:13:47-07:00

Commit Message:
TSAGE: Fix base hotspot classes of hotspots in Scene #40

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



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 6a82ca7..ee16464 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -1434,7 +1434,7 @@ void Scene40::Item2::doAction(int action) {
 		SceneItem::display2(40, 37);
 		break;
 	default:
-		SceneItem::doAction(action);
+		SceneHotspot::doAction(action);
 		break;
 	}
 }
@@ -1455,7 +1455,7 @@ void Scene40::Item6::doAction(int action) {
 		SceneItem::display2(40, 36);
 		break;
 	default:
-		SceneItem::doAction(action);
+		SceneHotspot::doAction(action);
 		break;
 	}
 }
@@ -1464,7 +1464,7 @@ void Scene40::Item6::doAction(int action) {
 
 Scene40::Scene40() :
 	_item1(2, OBJECT_SCANNER, 40, 24, OBJECT_STUNNER, 40, 25, CURSOR_LOOK, 40, 7, CURSOR_USE, 40, 16, LIST_END),
-	_item3(5, OBJECT_SCANNER, 40, 26, OBJECT_STUNNER, 40, 27, CURSOR_LOOK, 40, 9, CURSOR_USE, 40, 17, LIST_END),
+	_item3(5, OBJECT_SCANNER, 40, 28, OBJECT_STUNNER, 40, 27, CURSOR_LOOK, 40, 2, CURSOR_USE, 40, 30, LIST_END),
 	_item4(6, OBJECT_SCANNER, 40, 31, OBJECT_STUNNER, 40, 32, CURSOR_LOOK, 40, 5, CURSOR_USE, 40, 33, LIST_END),
 	_item5(0, CURSOR_LOOK, 40, 11, LIST_END),
 	_item7(4, OBJECT_SCANNER, 40, 26, OBJECT_STUNNER, 40, 27, CURSOR_LOOK, 40, 9, CURSOR_USE, 40, 17, LIST_END),
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 229dfc7..0f9bf61 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -215,15 +215,15 @@ class Scene40 : public Scene {
 	};
 
 	/* Items */
-	class Item2 : public SceneItem {
+	class Item2 : public SceneHotspot {
 	public:
 		virtual void doAction(int action);
 	};
-	class Item6 : public SceneItem {
+	class Item6 : public SceneHotspot {
 	public:
 		virtual void doAction(int action);
 	};
-	class Item8 : public SceneItem {
+	class Item8 : public SceneHotspot {
 	public:
 		virtual void doAction(int action);
 	};


Commit: f482e25f2a7419828351e0eb598247275646b8c2
    https://github.com/scummvm/scummvm/commit/f482e25f2a7419828351e0eb598247275646b8c2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-07-29T16:32:26-07:00

Commit Message:
TSAGE: Fix call to correct base class in Scene #60 items

Changed paths:
    engines/tsage/ringworld_scenes1.cpp



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index ee16464..f97cfa4 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -2289,7 +2289,7 @@ void Scene60::Item::doAction(int action) {
 		setAction(&scene->_sequenceManager, this, 62, NULL);
 		break;
 	default:
-		SceneItem::doAction(action);
+		SceneHotspot::doAction(action);
 		break;
 	}
 }