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

Strangerke Strangerke at scummvm.org
Wed Aug 28 00:07:25 CEST 2013


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:
269ec30699 TSAGE: Remove SceneExt::loadScene() as the code is duplicate from Scene::loadScene()
a52cb80ae0 TSAGE: Some renaming in Scene600


Commit: 269ec30699beee4913893750372de7c5777b3b5d
    https://github.com/scummvm/scummvm/commit/269ec30699beee4913893750372de7c5777b3b5d
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-27T15:06:07-07:00

Commit Message:
TSAGE: Remove SceneExt::loadScene() as the code is duplicate from Scene::loadScene()

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp
    engines/tsage/ringworld2/ringworld2_logic.h



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 174399f..a50dccd 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -384,27 +384,6 @@ void SceneExt::dispatch() {
 	Scene::dispatch();
 }
 
-void SceneExt::loadScene(int sceneNum) {
-	Scene::loadScene(sceneNum);
-
-	_v51C34.top = 0;
-	_v51C34.bottom = 300;
-
-	int prevScene = R2_GLOBALS._sceneManager._previousScene;
-	int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
-
-	if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50)) ||
-			(sceneNumber == 50) || ((prevScene == 205) && (sceneNumber == 100)) ||
-			((prevScene == 180) && (sceneNumber == 100))) {
-		// TODO: sub_17875
-		R2_GLOBALS._uiElements._active = true;
-		R2_GLOBALS._uiElements.show();
-	} else {
-		// Update the user interface
-		R2_GLOBALS._uiElements.updateInventory();
-	}
-}
-
 bool SceneExt::display(CursorType action, Event &event) {
 	switch (action) {
 	case CURSOR_CROSSHAIRS:
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 62a5961..2b2a28a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -101,7 +101,6 @@ public:
 	virtual void remove();
 	virtual void process(Event &event);
 	virtual void dispatch();
-	virtual void loadScene(int sceneNum);
 	virtual void refreshBackground(int xAmount, int yAmount);
 	virtual void saveCharacter(int characterIndex);
 	virtual void restore() {}


Commit: a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1
    https://github.com/scummvm/scummvm/commit/a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-27T15:06:08-07:00

Commit Message:
TSAGE: Some renaming in Scene600

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp
    engines/tsage/ringworld2/ringworld2_scenes0.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 01fa695..1439557 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -5544,10 +5544,10 @@ bool Scene600::Item4::startAction(CursorType action, Event &event) {
 
 	scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0);
 	scene->_stasisField.postInit();
-	scene->_actor2.postInit();
+	scene->_computer.postInit();
 
 	scene->_sceneMode = 612;
-	scene->setAction(&scene->_sequenceManager1, scene, 612, &scene->_stasisField, &scene->_actor2, &R2_GLOBALS._player, NULL);
+	scene->setAction(&scene->_sequenceManager1, scene, 612, &scene->_stasisField, &scene->_computer, &R2_GLOBALS._player, NULL);
 	return true;
 }
 
@@ -5824,11 +5824,12 @@ void Scene600::postInit(SceneObjectList *OwnerList) {
 
 		if (R2_GLOBALS.getFlag(8)) {
 			if (R2_GLOBALS.getFlag(9)) {
-				_actor2.postInit();
-				_actor2.setup(603, 2, 1);
-				_actor2.setPosition(Common::Point(233, 45));
-				_actor2.animate(ANIM_MODE_2, NULL);
-				_actor2.fixPriority(11);
+				// Computer is active
+				_computer.postInit();
+				_computer.setup(603, 2, 1);
+				_computer.setPosition(Common::Point(233, 45));
+				_computer.animate(ANIM_MODE_2, NULL);
+				_computer.fixPriority(11);
 			}
 		} else {
 			_smoke.postInit();
@@ -5937,7 +5938,7 @@ void Scene600::signal() {
 		R2_GLOBALS.setFlag(9);
 		_stasisField.remove();
 		R2_GLOBALS._sceneItems.remove(&_item4);
-		_actor2.setDetails(600, 21, -1, 23, 4, &_item4);
+		_computer.setDetails(600, 21, -1, 23, 4, &_item4);
 		_background.setDetails(600, 7, -1, -1, 3, (SceneItem *) NULL);
 		R2_GLOBALS._player.enableControl(CURSOR_USE);
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index fa20463..a2f2acc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -673,7 +673,7 @@ public:
 	CompartmentHotspot _item5;
 	BackgroundSceneObject _object1;
 	SceneActor _actor1;
-	SceneActor _actor2;
+	SceneActor _computer;
 	SceneActor _stasisField;
 	Smoke _smoke;
 	Doorway _doorway;






More information about the Scummvm-git-logs mailing list