TSAGE: Bugfixes for getting cords and looking at generator in BF Scene 910

2 files changed, 22 insertions, 22 deletions

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index 89c721964d..be8c7ac66d 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -1154,7 +1154,7 @@ bool Scene910::BreakerBox::startAction(CursorType action, Event &event) {
 	}
 }
 
-bool Scene910::Object11::startAction(CursorType action, Event &event) {
+bool Scene910::FakeWall::startAction(CursorType action, Event &event) {
 	Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
 
 	if (action == 57) {
@@ -1731,7 +1731,7 @@ void Scene910::Object28::remove() {
 	SceneObject::remove();
 }
 
-void Scene910::Object29::postInit(SceneObjectList *OwnerList) {
+void Scene910::GeneratorInset::postInit(SceneObjectList *OwnerList) {
 	Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
 
 	FocusObject::postInit();
@@ -1747,7 +1747,7 @@ void Scene910::Object29::postInit(SceneObjectList *OwnerList) {
 	_object31.subED6EA(BF_GLOBALS._v4CECE[17]);
 }
 
-void Scene910::Object29::remove() {
+void Scene910::GeneratorInset::remove() {
 	Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
 
 	BF_GLOBALS._player.disableControl();
@@ -1983,20 +1983,20 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 	_fakeWall.setVisage(910);
 	_fakeWall.setStrip(8);
 	_fakeWall.setFrame(4);
-	_fakeWall.setPriority(48);
+	_fakeWall.fixPriority(48);
 
 	_yellowCord.init(1);
 	_yellowCord.setVisage(910);
 	_yellowCord.setStrip(6);
 	_yellowCord.setFrame(2);
-	_yellowCord.setPriority(50);
+	_yellowCord.fixPriority(50);
 
 	_blackCord.init(2);
 	_blackCord.setVisage(910);
 	_blackCord.setStrip(6);
 	_blackCord.setFrame(1);
 	_blackCord.setPosition(Common::Point(114, 149));
-	_blackCord.setPriority(246);
+	_blackCord.fixPriority(246);
 
 	if (BF_GLOBALS._dayNumber < 5)
 		_item17.setDetails(Rect(0, 149, 29, 167), 910, -1, -1, -1, 1, NULL);
@@ -2020,7 +2020,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 	_fakeWall.setDetails(910, 28, -1, 30, 1, NULL);
 	_item3.setDetails(7, 910, 59, 60, 61, 1);
 	_item5.setDetails(2, 910, 19, 20, 21, 1);
-	_item12.setDetails(6, 910, 28, 29, 30, 1);
+	_backWall.setDetails(6, 910, 28, 29, 30, 1);
 	_item13.setDetails(5, 910, 31, 32, 33, 1);
 	_item14.setDetails(Rect(0, 0, 320, 170), 910, 3, 4, 5, 1, NULL);
 	if (BF_GLOBALS._dayNumber == 0) {
@@ -2147,10 +2147,10 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 		_object7.setAction(&_action2);
 	}
 
-	if (BF_INVENTORY.getObjectScene(57) == 1)
+	if (BF_INVENTORY.getObjectScene(INV_YELLOW_CORD) == 1)
 		_yellowCord.setPosition(Common::Point(540, 100));
 
-	if (BF_INVENTORY.getObjectScene(59) == 1)
+	if (BF_INVENTORY.getObjectScene(INV_BLACK_CORD) == 1)
 		_blackCord.setPosition(Common::Point(540, 100));
 
 	if (BF_GLOBALS._v4CECC == 2) {
@@ -2385,12 +2385,12 @@ void Scene910::signal() {
 		break;
 	case 9103:
 		BF_GLOBALS._player.enableControl();
-		_object29.postInit();
-		_object29.setVisage(910);
-		_object29.setStrip(3);
-		_object29.setFrame(2);
-		_object29.setPosition(Common::Point(160, 130));
-		_object29.fixPriority(250);
+		_generatorInset.postInit();
+		_generatorInset.setVisage(910);
+		_generatorInset.setStrip(3);
+		_generatorInset.setFrame(2);
+		_generatorInset.setPosition(Common::Point(160, 130));
+		_generatorInset.fixPriority(250);
 		break;
 	case 9110:
 		if (!BF_GLOBALS.getFlag(fGotPointsForCrate)) {
@@ -2891,8 +2891,8 @@ void Scene910::subE83E1() {
 		// _objectList.draw();
 		if (BF_GLOBALS._sceneObjects->contains(&_breakerBoxInset))
 			_breakerBoxInset.remove();
-		if (BF_GLOBALS._sceneObjects->contains(&_object29))
-			_object29.remove();
+		if (BF_GLOBALS._sceneObjects->contains(&_generatorInset))
+			_generatorInset.remove();
 
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 9120;
diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h
index d872222bee..dc983adeb1 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.h
+++ b/engines/tsage/blue_force/blueforce_scenes9.h
@@ -160,7 +160,7 @@ class Scene910: public PalettedScene {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Object11: public NamedObject {
+	class FakeWall: public NamedObject {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -209,7 +209,7 @@ class Scene910: public PalettedScene {
 		void subED6EA(int frame);
 	};
 
-	class Object29: public FocusObject {
+	class GeneratorInset: public FocusObject {
 		Object28 _object30;
 		Object31 _object31;
 	public:
@@ -267,16 +267,16 @@ public:
 	NamedObject _object5,  _vent, _object7;
 	Object8 _blackCord, _yellowCord;
 	BreakerBox _breakerBox;
-	Object11 _fakeWall;
+	FakeWall _fakeWall;
 	BreakerBoxInset _breakerBoxInset;
-	FocusObject _object29;
+	GeneratorInset _generatorInset;
 	NamedObject _object30, _object31, _object32;
 	Item1 _generator;
 	Item2 _item2;
 	Item3 _item3;
 	NamedHotspot _item4,  _item5,  _item6,  _item7,  _item8;
 	Item9 _item9, _item10;
-	NamedHotspot _item11, _item12, _item13, _item14;
+	NamedHotspot _item11, _backWall, _item13, _item14;
 	Item15 _item15;
 	Item16 _item16;
 	Item17 _item17;