From 1809cc567303651dd3acd54d64f0e7c33a2651df Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 30 Jul 2013 23:00:55 -0400
Subject: TSAGE: R2R fixes for reading infodisk

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 19 ++++++++++---------
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 3cb3574364..4018921791 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -573,23 +573,23 @@ void Scene125::Icon::hideIcon() {
 
 /*--------------------------------------------------------------------------*/
 
-bool Scene125::Item4::startAction(CursorType action, Event &event) {
+bool Scene125::DiskSlot::startAction(CursorType action, Event &event) {
 	Scene125 *scene = (Scene125 *)R2_GLOBALS._sceneManager._scene;
 	switch (action) {
 	case CURSOR_USE:
 		if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == R2_GLOBALS._player._oldCharacterScene[1]) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 126;
-			scene->setAction(&scene->_sequenceManager, scene, 126, &scene->_object7, NULL);
+			scene->setAction(&scene->_sequenceManager, scene, 126, &scene->_infoDisk, NULL);
 			return true;
 		}
 		break;
 	case R2_OPTO_DISK:
 		if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == 1) {
 			R2_GLOBALS._player.disableControl();
-			scene->_object7.postInit();
+			scene->_infoDisk.postInit();
 			scene->_sceneMode = 125;
-			scene->setAction(&scene->_sequenceManager, scene, 125, &scene->_object7, NULL);
+			scene->setAction(&scene->_sequenceManager, scene, 125, &scene->_infoDisk, NULL);
 			return true;
 		}
 		break;
@@ -626,16 +626,16 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.disableControl();
 
 	if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == R2_GLOBALS._player._oldCharacterScene[1]) {
-		_object7.postInit();
-		_object7.setup(160, 3, 5);
-		_object7.setPosition(Common::Point(47, 167));
+		_infoDisk.postInit();
+		_infoDisk.setup(160, 3, 5);
+		_infoDisk.setPosition(Common::Point(47, 167));
 	}
 
 	_object6.postInit();
 	_object6.setup(162, 1, 1);
 	_object6.setPosition(Common::Point(214, 168));
 
-	_item4.setDetails(Rect(27, 145, 81, 159), 126, 9, -1, -1, 1, NULL);
+	_diskSlot.setDetails(Rect(27, 145, 81, 159), 126, 9, -1, -1, 1, NULL);
 	_item3.setDetails(Rect(144, 119, 286, 167), 126, 6, 7, 8, 1, NULL);
 	_item2.setDetails(1, 126, 3, 4, 5);
 	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 126, 0, 1, -1, 1, NULL);
@@ -782,10 +782,11 @@ void Scene125::signal() {
 		break;
 	case 125:
 		R2_INVENTORY.setObjectScene(R2_OPTO_DISK, R2_GLOBALS._player._oldCharacterScene[1]);
+		R2_GLOBALS._player.enableControl();
 		break;
 	case 126:
 		R2_INVENTORY.setObjectScene(R2_OPTO_DISK, 1);
-		_object7.remove();
+		_infoDisk.remove();
 		R2_GLOBALS._player.enableControl();
 		R2_GLOBALS._player._canWalk = false;
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 51cdd88cc1..80dab89b32 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -126,7 +126,7 @@ class Scene125: public SceneExt {
 	};
 
 	/* Items */
-	class Item4: public NamedHotspot {
+	class DiskSlot: public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -135,8 +135,8 @@ public:
 	ScenePalette _palette;
 	ASoundExt _sound1;
 	NamedHotspot _background, _item2, _item3;
-	Item4 _item4;
-	SceneActor _object1, _object2, _object3, _object4, _object5, _object6, _object7;
+	DiskSlot _diskSlot;
+	SceneActor _object1, _object2, _object3, _object4, _object5, _object6, _infoDisk;
 	Icon _icon1, _icon2, _icon3, _icon4, _icon5,  _icon6;
 	SequenceManager _sequenceManager;
 	SceneText _sceneText;
-- 
cgit v1.2.3