TSAGE: Implemented Blue Force scene 370 - Future Wave bedroom

scummvm · Sep 18, 2011 · 95467a3 · 95467a3
1 parent c5615d7
commit 95467a3
Show file tree

Hide file tree

Showing 6 changed files with 620 additions and 2 deletions.
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -107,8 +107,10 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
 		return new Scene350();
 	case 355:
 	case 360:
-	case 370:
 		error("Scene group 3 not implemented");
+	case 370:
+		// Future Wave Bedroom
+		return new Scene370();
 	case 380:
 		// Outside City Hall & Jail
 		return new Scene380();
@@ -414,7 +416,7 @@ bool NamedObject::startAction(CursorType action, Event &event) {
 	}
 
 	if (!handled)
-		((SceneExt *)BF_GLOBALS._sceneManager._scene)->display(action);
+		handled = ((SceneExt *)BF_GLOBALS._sceneManager._scene)->display(action);
 	return handled;
 }
 

diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
@@ -124,6 +124,19 @@ class NamedObjectExt: public NamedObject {
 	}
 };
 
+class NamedObject2: public NamedObject {
+public:
+	int _v1, _v2;
+
+	NamedObject2() { _v1 = _v2 = 0; }
+	virtual Common::String getClassName() { return "NamedObject2"; }
+	virtual void synchronize(Serializer &s) {
+		NamedObject::synchronize(s);
+		s.syncAsSint16LE(_v1);
+		s.syncAsSint16LE(_v2);
+	}
+};
+
 class CountdownObject: public NamedObject {
 public:
 	int _countDown;