aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/blue_force
diff options
context:
space:
mode:
authorStrangerke2011-11-23 08:55:20 +0100
committerStrangerke2011-11-23 08:56:00 +0100
commit233b4541a9697dd1e8393d321340d209659cd8a5 (patch)
treea50aaa3103beb3f26bb2340a08944a0b7a2bb864 /engines/tsage/blue_force
parent01edcbf9638b525632e7744bad687a06498f27ce (diff)
downloadscummvm-rg350-233b4541a9697dd1e8393d321340d209659cd8a5.tar.gz
scummvm-rg350-233b4541a9697dd1e8393d321340d209659cd8a5.tar.bz2
scummvm-rg350-233b4541a9697dd1e8393d321340d209659cd8a5.zip
TSAGE: Blue Force - Rename another variable, add a comment about a useless (?) variable
Diffstat (limited to 'engines/tsage/blue_force')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.h1
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.cpp12
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.h2
3 files changed, 9 insertions, 6 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 29adec7e00..9b0bf556f4 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -170,6 +170,7 @@ public:
int _sceneNumber;
int _visage;
CursorType _cursorId;
+ // TODO: Check if really useless in original
bool _field1222;
Scene60();
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index 6e007158c0..ea54bf6b1d 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -180,6 +180,7 @@ bool Scene900::Lyle::startAction(CursorType action, Event &event) {
if (action == CURSOR_TALK) {
if (!_action) {
if (scene->_dog._flag) {
+ // Dog is no longer there
if (BF_GLOBALS._gateStatus == 0)
scene->_stripManager.start(9004, &BF_GLOBALS._stripProxy);
else {
@@ -192,10 +193,11 @@ bool Scene900::Lyle::startAction(CursorType action, Event &event) {
scene->_stripManager.start(9001, &BF_GLOBALS._stripProxy);
}
} else {
- if (scene->_field1974)
+ // Dog is there
+ if (scene->_lyleDialogCtr)
scene->_stripManager.start(9003, &BF_GLOBALS._stripProxy);
else {
- ++scene->_field1974;
+ ++scene->_lyleDialogCtr;
scene->_stripManager.start(9002, &BF_GLOBALS._stripProxy);
}
}
@@ -416,7 +418,7 @@ void Scene900::Action4::signal() {
/*--------------------------------------------------------------------------*/
Scene900::Scene900(): PalettedScene() {
- _field1974 = _field1976 = 0;
+ _lyleDialogCtr = _field1976 = 0;
}
void Scene900::postInit(SceneObjectList *OwnerList) {
@@ -425,7 +427,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS._sceneManager._previousScene == 910)
BF_GLOBALS._sound1.changeSound(91);
- _field1974 = 0;
+ _lyleDialogCtr = 0;
_field1976 = 0;
T2_GLOBALS._uiElements._active = true;
BF_GLOBALS.clearFlag(fCanDrawGun);
@@ -718,7 +720,7 @@ void Scene900::dispatch() {
void Scene900::synchronize(Serializer &s) {
SceneExt::synchronize(s);
- s.syncAsSint16LE(_field1974);
+ s.syncAsSint16LE(_lyleDialogCtr);
s.syncAsSint16LE(_field1976);
}
diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h
index 22e8854163..9ae542c21d 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.h
+++ b/engines/tsage/blue_force/blueforce_scenes9.h
@@ -110,7 +110,7 @@ public:
Action2 _action2;
Action3 _action3;
Action4 _action4;
- int _field1974;
+ int _lyleDialogCtr;
int _field1976;
Scene900();