aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/blue_force
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tsage/blue_force')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.cpp15
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.h4
2 files changed, 10 insertions, 9 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 351301f245..28a5f05193 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -331,6 +331,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
SceneExt::postInit();
BF_GLOBALS._interfaceY = 200;
+ BF_GLOBALS._uiElements._active = false;
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setVisage(830);
BF_GLOBALS._player.setStrip(3);
@@ -505,7 +506,7 @@ void Scene50::process(Event &event) {
*
*--------------------------------------------------------------------------*/
-bool Scene60::Item2::startAction(CursorType action, Event &event) {
+bool Scene60::Ignition::startAction(CursorType action, Event &event) {
Scene60 *scene = (Scene60 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
case CURSOR_LOOK:
@@ -532,7 +533,7 @@ bool Scene60::Item2::startAction(CursorType action, Event &event) {
return true;
}
-bool Scene60::Item2::check1() {
+bool Scene60::Ignition::check1() {
if (BF_GLOBALS._bookmark >= bStoppedFrankie) {
BF_GLOBALS._v5098C |= 1;
return false;
@@ -581,7 +582,7 @@ bool Scene60::Item2::check1() {
return false;
}
-bool Scene60::Item2::check2() {
+bool Scene60::Ignition::check2() {
switch (BF_GLOBALS._bookmark) {
case bInspectionDone:
if (BF_GLOBALS._v5098D & 1) {
@@ -1013,13 +1014,13 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS.getFlag(fWithLyle)) {
_visage = 62;
- _item2._sceneRegionId = 22;
+ _ignition._sceneRegionId = 22;
} else if (BF_GLOBALS.getFlag(onDuty)) {
_visage = 63;
- _item2._sceneRegionId = 20;
+ _ignition._sceneRegionId = 20;
} else {
_visage = 61;
- _item2._sceneRegionId = 28;
+ _ignition._sceneRegionId = 28;
}
_dashboard.setup(_visage, 1, 1, 160, 168, 100);
_cursorId = CURSOR_USE;
@@ -1073,7 +1074,7 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._sceneItems.push_back(&_compartment);
}
- BF_GLOBALS._sceneItems.push_back(&_item2);
+ BF_GLOBALS._sceneItems.push_back(&_ignition);
BF_GLOBALS._sceneItems.push_back(&_item3);
BF_GLOBALS._player.enableControl();
BF_GLOBALS._events.setCursor(CURSOR_USE);
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 01b7db59dc..9c401f3763 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -99,7 +99,7 @@ public:
class Scene60 : public SceneExt {
/* Items */
- class Item2: public NamedHotspot {
+ class Ignition: public NamedHotspot {
private:
bool check1();
bool check2();
@@ -161,7 +161,7 @@ public:
SceneObject _dashboard;
AltSceneObject _car;
NamedHotspot _item1;
- Item2 _item2;
+ Ignition _ignition;
Item3 _item3;
Radio _radio;
Compartment _compartment;