aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/blue_force/blueforce_scenes9.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tsage/blue_force/blueforce_scenes9.cpp')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.cpp51
1 files changed, 26 insertions, 25 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index ea54bf6b1d..2178f31b30 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -35,7 +35,7 @@ namespace BlueForce {
*
*--------------------------------------------------------------------------*/
-bool Scene900::Item1::startAction(CursorType action, Event &event) {
+bool Scene900::Exterior::startAction(CursorType action, Event &event) {
if (action == CURSOR_LOOK) {
SceneItem::display2(900, 6);
return true;
@@ -44,7 +44,7 @@ bool Scene900::Item1::startAction(CursorType action, Event &event) {
}
}
-bool Scene900::Item4::startAction(CursorType action, Event &event) {
+bool Scene900::WestExit::startAction(CursorType action, Event &event) {
Scene900 *scene = (Scene900 *)BF_GLOBALS._sceneManager._scene;
BF_GLOBALS._player.disableControl();
@@ -386,7 +386,7 @@ void Scene900::Action3::signal() {
break;
default:
break;
- }
+ }
}
void Scene900::Action4::signal() {
@@ -442,7 +442,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_body.fixPriority(120);
_body.setVisage(901);
_body.setPosition(Common::Point(159,128));
- _body.setDetails(900, 15, 16, 17, ANIM_MODE_1, NULL);
+ _body.setDetails(900, 15, 16, 17, ANIM_MODE_1, (SceneItem *)NULL);
}
if (BF_GLOBALS._sceneManager._previousScene == 910) {
_sceneBounds.moveTo(639, 0);
@@ -458,14 +458,14 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_stripManager.addSpeaker(&_jakeJacketSpeaker);
_stripManager.addSpeaker(&_lyleHatSpeaker);
- _item4.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0);
+ _westExit.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0);
BF_GLOBALS._player.postInit();
_dog.postInit();
_dog.setVisage(902);
_dog.setPosition(Common::Point(845, 135));
_dog.fixPriority(122);
- _dog.setDetails(900, 8, -1, 9, 1, NULL);
+ _dog.setDetails(900, 8, -1, 9, 1, (SceneItem *)NULL);
if (_dog._flag == 0) {
_dog.animate(ANIM_MODE_1, NULL);
@@ -524,7 +524,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_lyle.postInit();
_lyle._moveDiff.y = 7;
_lyle._flags |= OBJFLAG_CHECK_REGION;
- _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+ _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
_lyleHatSpeaker._xp = 210;
_jakeJacketSpeaker._xp = 75;
setAction(&_sequenceManager1, this, 9013, &BF_GLOBALS._player, &_lyle, NULL);
@@ -537,10 +537,10 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_lyle.setPosition(Common::Point(780, 153));
_lyle._moveDiff.y = 7;
_lyle._flags |= 0x1000;
- _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+ _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
_lyle.animate(ANIM_MODE_1, NULL);
_lyle.setObjectWrapper(new SceneObjectWrapper());
- }
+ }
_sceneMode = 9000;
setAction(&_sequenceManager1, this, 9000, &BF_GLOBALS._player, NULL);
@@ -553,17 +553,17 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS.getFlag(fWithLyle)) {
_lyle.postInit();
_lyle._flags |= 0x1000;
- _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+ _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
setAction(&_sequenceManager1, this, 9014, &BF_GLOBALS._player, &_door, &_lyle, NULL);
} else
setAction(&_sequenceManager1, this, 9002, &BF_GLOBALS._player, &_door, NULL);
}
- _gate.setDetails(900, 0, -1, 1, 1, 0);
- _door.setDetails(900, 2, -1, 5, 1, 0);
+ _gate.setDetails(900, 0, -1, 1, 1, (SceneItem *)NULL);
+ _door.setDetails(900, 2, -1, 5, 1, (SceneItem *)NULL);
_item2.setDetails(Rect(0, 0, 225, 21), 666, 25, -1, -1, 1, NULL);
_item3.setDetails(Rect(37, 21, 324, 50), 666, 26, -1, -1, 1, NULL);
- _item1.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL);
+ _exterior.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL);
}
void Scene900::signal() {
@@ -692,7 +692,7 @@ void Scene900::process(Event &event) {
SceneExt::process(event);
if (BF_GLOBALS._player._enabled && !_focusObject && (event.mousePos.y < (UI_INTERFACE_Y - 1))) {
- if (_item4.contains(event.mousePos)) {
+ if (_westExit.contains(event.mousePos)) {
GfxSurface surface = _cursorVisage.getFrame(EXITFRAME_W);
BF_GLOBALS._events.setCursor(surface);
} else {
@@ -1285,9 +1285,9 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) {
}
if (_mode != 1)
- BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_state + 251) % 256;
+ BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_frame + 251) % 256;
else
- BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _state;
+ BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _frame;
switch (_state) {
case 1:
@@ -2019,10 +2019,10 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS._v4CEE2 == 0)
_item16.setDetails(Rect(265, 18, 319, 102), 910, -1, -1, -1, 1, NULL);
- _breakerBox.setDetails(910, 6, -1, -1, 1, NULL);
+ _breakerBox.setDetails(910, 6, -1, -1, 1, (SceneItem *)NULL);
_item15.setDetails(Rect(0, 0, 320, 170), 910, 0, 1, 2, 1, NULL);
- _yellowCord.setDetails(910, 52, 53, -1, 1, NULL);
- _blackCord.setDetails(910, 54, 55, -1, 1, NULL);
+ _yellowCord.setDetails(910, 52, 53, -1, 1, (SceneItem *)NULL);
+ _blackCord.setDetails(910, 54, 55, -1, 1, (SceneItem *)NULL);
_item2.setDetails(3, 910, 22, -1, 24, 1);
_item4.setDetails(1, 910, 16, 17, 18, 1);
_item8.setDetails(4, 910, 25, 26, 27, 1);
@@ -2032,7 +2032,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
_item9.setDetails(Rect(266, 39, 274, 70), 910, 43, 44, 45, 1, NULL);
_item10.setDetails(Rect(276, 27, 288, 83), 910, 46, 47, 48, 1, NULL);
_item11.setDetails(Rect(295, 42, 312, 87), 910, 49, 50, 51, 1, NULL);
- _fakeWall.setDetails(910, 28, -1, 30, 1, NULL);
+ _fakeWall.setDetails(910, 28, -1, 30, 1, (SceneItem *)NULL);
_item3.setDetails(7, 910, 59, 60, 61, 1);
_item5.setDetails(2, 910, 19, 20, 21, 1);
_backWall.setDetails(6, 910, 28, 29, 30, 1);
@@ -2125,7 +2125,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
_lyle.setFrame(3);
_lyle._field90 = 1;
_lyle.setDetails(910, 69, 70 ,71 , 5, &_item4);
-
+
BF_GLOBALS._walkRegions.disableRegion(15);
BF_GLOBALS._walkRegions.disableRegion(16);
BF_GLOBALS._walkRegions.disableRegion(14);
@@ -2209,7 +2209,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
_fakeWall.hide();
if (BF_GLOBALS._v4CECC != 2)
_yellowCord.setPosition(Common::Point(291, -30));
- BF_GLOBALS._walkRegions.disableRegion(10);
+ BF_GLOBALS._walkRegions.enableRegion(10);
}
if (BF_GLOBALS._breakerBoxStatusArr[17] != 0) {
@@ -2600,7 +2600,7 @@ void Scene910::signal() {
BF_GLOBALS.setFlag(fBackupAt340);
BF_GLOBALS._v4CEE2 = 4;
_stuart.postInit();
- _nico.setDetails(910, 72, 73, 74, 3, NULL);
+ _nico.setDetails(910, 72, 73, 74, 3, (SceneItem *)NULL);
_stuart.setDetails(910, 66, 67, 68, 5, &_nico);
BF_GLOBALS._v4CEE8 = 0;
_sceneMode = 9121;
@@ -3358,14 +3358,14 @@ void Scene930::postInit(SceneObjectList *OwnerList) {
_box.setVisage(930);
_box.setStrip(1);
_box.setPosition(Common::Point(223, 21));
- _box.setDetails(930, 66, 67, 68, 1, NULL);
+ _box.setDetails(930, 66, 67, 68, 1, (SceneItem *)NULL);
}
_boots.postInit();
_boots.setVisage(930);
_boots.setStrip(2);
_boots.setPosition(Common::Point(9, 161));
_boots.fixPriority(120);
- _boots.setDetails(930, 62, 63, 64, 1, NULL);
+ _boots.setDetails(930, 62, 63, 64, 1, (SceneItem *)NULL);
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setVisage(368);
@@ -3375,6 +3375,7 @@ void Scene930::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.fixPriority(80);
BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.enableControl();
+ BF_GLOBALS._events.setCursor(CURSOR_WALK);
_item1.setDetails( 1, 930, 0, 1, 2, 1);
_item2.setDetails( 2, 930, 4, 5, 6, 1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 00:44:53 +0000