[Scummvm-cvs-logs] scummvm master -> 1ae18a2e2bff95cfde7cd93983b0ca3fd5f824b1
Strangerke
Strangerke at scummvm.org
Mon Jan 16 19:24:26 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1ae18a2e2b TSAGE: R2R - Scene 1550: Implement UnkObj15502::subA5CDF()
Commit: 1ae18a2e2bff95cfde7cd93983b0ca3fd5f824b1
https://github.com/scummvm/scummvm/commit/1ae18a2e2bff95cfde7cd93983b0ca3fd5f824b1
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-01-16T10:23:52-08:00
Commit Message:
TSAGE: R2R - Scene 1550: Implement UnkObj15502::subA5CDF()
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes1.cpp
engines/tsage/ringworld2/ringworld2_scenes1.h
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 3510920..8bbf9ad 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2175,6 +2175,61 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
}
}
+void Scene1550::UnkObj15502::subA5CDF(int strip) {
+ _fieldA4 = strip;
+ postInit();
+ setup(1517, _fieldA4, 1);
+ switch (_fieldA4 - 1) {
+ case 0:
+ if (R2_INVENTORY.getObjectScene(R2_22) == 0)
+ setFrame(5);
+ setPosition(Common::Point(287, 85));
+ break;
+ case 1:
+ if (R2_INVENTORY.getObjectScene(R2_25) == 0)
+ setFrame(5);
+ setPosition(Common::Point(248, 100));
+ break;
+ case 2:
+ if (R2_INVENTORY.getObjectScene(R2_28) == 0)
+ setFrame(5);
+ setPosition(Common::Point(217, 85));
+ break;
+ case 3:
+ if (R2_INVENTORY.getObjectScene(R2_23))
+ setFrame(5);
+ setPosition(Common::Point(161, 121));
+ break;
+ case 4:
+ if (R2_INVENTORY.getObjectScene(R2_27))
+ setFrame(5);
+ setPosition(Common::Point(117, 121));
+ break;
+ case 5:
+ if (R2_INVENTORY.getObjectScene(R2_17))
+ setFrame(5);
+ setPosition(Common::Point(111, 85));
+ break;
+ case 6:
+ if (R2_INVENTORY.getObjectScene(R2_45))
+ setFrame(5);
+ setPosition(Common::Point(95, 84));
+ break;
+ case 7: {
+ setup(1516, 1, 1);
+ setPosition(Common::Point(201, 45));
+ Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+ if ((scene->_sceneMode == 1577) || (scene->_sceneMode == 1578))
+ hide();
+ fixPriority(92);
+ setDetails(1550, 70, -1, -1, 2, (SceneItem *) NULL);
+ }
+ break;
+ default:
+ break;
+ }
+}
+
Scene1550::UnkObj15503::UnkObj15503() {
_fieldA4 = 0;
}
@@ -2503,7 +2558,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
_field412 = 1;
_actor1.postInit();
- warning("_arrUnkObj15502[7].subA5CDF()");
+ _arrUnkObj15502[7].subA5CDF(8);
_arrUnkObj15502[7].hide();
if (R2_GLOBALS._player._characterIndex == 1)
_sceneMode = 1577;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index aa39545..ba146ab 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -251,6 +251,7 @@ class Scene1550 : public SceneExt {
void synchronize(Serializer &s);
virtual bool startAction(CursorType action, Event &event);
+ void subA5CDF(int strip);
};
class UnkObj15503 : public SceneActor {
More information about the Scummvm-git-logs
mailing list