libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 08:53:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: JANITORIAL: Remove trailing spaces

Browse Source
This commit is contained in:
Strangerke 2012-02-25 12:44:37 +01:00
parent 3a3c1eec53
commit 9279b25694
28 changed files with 951 additions and 951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/tsage/blue_force/blueforce_logic.cpp
View File

@ -733,7 +733,7 @@ void SceneExt::remove() {
_action->_endHandler = NULL; _action->_endHandler = NULL;
_action->remove(); _action->remove();
} }
_focusObject = NULL; _focusObject = NULL;
} }
@ -1326,7 +1326,7 @@ bool BlueForceInvObjectList::SelectItem(int objectNumber) {
AmmoBeltDialog *dlg = new AmmoBeltDialog(); AmmoBeltDialog *dlg = new AmmoBeltDialog();
dlg->execute(); dlg->execute();
delete dlg; delete dlg;
return true; return true;
} }
@ -1408,7 +1408,7 @@ void SceneMessage::signal() {
} }
void SceneMessage::process(Event &event) { void SceneMessage::process(Event &event) {
if ((event.eventType == EVENT_BUTTON_DOWN) || if ((event.eventType == EVENT_BUTTON_DOWN) ||
((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_RETURN))) { ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_RETURN))) {
signal(); signal();
} }
@ -1439,7 +1439,7 @@ void SceneMessage::draw() {
void SceneMessage::clear() { void SceneMessage::clear() {
// Fade out the text display // Fade out the text display
static const uint32 black = 0; static const uint32 black = 0;
BF_GLOBALS._scenePalette.fade((const byte *)&black, false, 100); BF_GLOBALS._scenePalette.fade((const byte *)&black, false, 100);
// Refresh the background // Refresh the background

40
engines/tsage/blue_force/blueforce_scenes1.cpp
View File

@ -430,7 +430,7 @@ void Scene110::Action1::signal() {
case 6: case 6:
// Play "Vroum" // Play "Vroum"
scene->_sound.play(31); scene->_sound.play(31);
// The guy starts the engine // The guy starts the engine
scene->_object4.setStrip(3); scene->_object4.setStrip(3);
scene->_object4._frame = 1; scene->_object4._frame = 1;
scene->_object4.animate(ANIM_MODE_5, NULL); scene->_object4.animate(ANIM_MODE_5, NULL);
@ -837,7 +837,7 @@ void Scene110::postInit(SceneObjectList *OwnerList) {
_object10._moveDiff.y = 10; _object10._moveDiff.y = 10;
_object10.setPosition(_object9._position); _object10.setPosition(_object9._position);
_object10.hide(); _object10.hide();
setAction(&_action1); setAction(&_action1);
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
@ -987,7 +987,7 @@ void Scene114::signal() {
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
bool Scene115::Kate::startAction(CursorType action, Event &event) { bool Scene115::Kate::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
SceneItem::display(115, 8, SET_WIDTH, 312, SceneItem::display(115, 8, SET_WIDTH, 312,
@ -1061,7 +1061,7 @@ bool Scene115::Kate::startAction(CursorType action, Event &event) {
bool Scene115::Tony::startAction(CursorType action, Event &event) { bool Scene115::Tony::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
SceneItem::display(115, 7, SET_WIDTH, 312, SceneItem::display(115, 7, SET_WIDTH, 312,
@ -1164,7 +1164,7 @@ bool Scene115::Tony::startAction(CursorType action, Event &event) {
bool Scene115::Object3::startAction(CursorType action, Event &event) { bool Scene115::Object3::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
SceneItem::display(115, 9, SET_WIDTH, 312, SceneItem::display(115, 9, SET_WIDTH, 312,
@ -1195,7 +1195,7 @@ bool Scene115::Object3::startAction(CursorType action, Event &event) {
bool Scene115::Object4::startAction(CursorType action, Event &event) { bool Scene115::Object4::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
SceneItem::display(115, 42, SET_WIDTH, 312, SceneItem::display(115, 42, SET_WIDTH, 312,
@ -1217,7 +1217,7 @@ bool Scene115::Object4::startAction(CursorType action, Event &event) {
void Scene115::Jukebox::signal() { void Scene115::Jukebox::signal() {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
if (_jokeboxPlayingCtr == 2) if (_jokeboxPlayingCtr == 2)
_jokeboxPlayingCtr = 0; _jokeboxPlayingCtr = 0;
else if (_jokeboxPlayingCtr == 1) { else if (_jokeboxPlayingCtr == 1) {
@ -1228,7 +1228,7 @@ void Scene115::Jukebox::signal() {
bool Scene115::Jukebox::startAction(CursorType action, Event &event) { bool Scene115::Jukebox::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
if (action == CURSOR_USE) { if (action == CURSOR_USE) {
if (_jokeboxPlayingCtr == 0) { if (_jokeboxPlayingCtr == 0) {
_jokeboxPlayingCtr = 1; _jokeboxPlayingCtr = 1;
@ -1241,7 +1241,7 @@ bool Scene115::Jukebox::startAction(CursorType action, Event &event) {
SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9, SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9,
SET_EXT_FGCOLOR, 13, LIST_END); SET_EXT_FGCOLOR, 13, LIST_END);
return true; return true;
} else } else
return NamedHotspot::startAction(action, event); return NamedHotspot::startAction(action, event);
} }
@ -1265,7 +1265,7 @@ void Scene115::EventHandler1::dispatch() {
bool Scene115::Item10::startAction(CursorType action, Event &event) { bool Scene115::Item10::startAction(CursorType action, Event &event) {
Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene; Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
if (BF_GLOBALS.getFlag(fWithLyle)) { if (BF_GLOBALS.getFlag(fWithLyle)) {
scene->_object4.setStrip2(6); scene->_object4.setStrip2(6);
Common::Point pt(-20, 122); Common::Point pt(-20, 122);
@ -1591,7 +1591,7 @@ Scene115::Scene115() : SceneExt () {
void Scene115::postInit(SceneObjectList *OwnerList) { void Scene115::postInit(SceneObjectList *OwnerList) {
SceneExt::postInit(); SceneExt::postInit();
BF_GLOBALS._sound1.fadeSound(15); BF_GLOBALS._sound1.fadeSound(15);
loadScene(115); loadScene(115);
setZoomPercents(98, 85, 115, 100); setZoomPercents(98, 85, 115, 100);
@ -1641,7 +1641,7 @@ void Scene115::postInit(SceneObjectList *OwnerList) {
_object11.postInit(); _object11.postInit();
_object11.hide(); _object11.hide();
_object12.postInit(); _object12.postInit();
_object12.hide(); _object12.hide();
@ -1817,7 +1817,7 @@ void Scene125::Action1::signal() {
case 0: case 0:
// No break on purpose // No break on purpose
default: default:
break; break;
} }
} }
@ -2054,7 +2054,7 @@ void Scene125::Action3::dispatch() {
SceneObject *owner = static_cast<SceneObject *>(this->_owner); SceneObject *owner = static_cast<SceneObject *>(this->_owner);
Action::dispatch(); Action::dispatch();
if ((_actionIndex == 9) && (owner->_percent > 70)) if ((_actionIndex == 9) && (owner->_percent > 70))
owner->changeZoom(owner->_percent - 1); owner->changeZoom(owner->_percent - 1);
} }
@ -2095,7 +2095,7 @@ void Scene125::Action4::dispatch() {
SceneObject *owner = static_cast<SceneObject *>(this->_owner); SceneObject *owner = static_cast<SceneObject *>(this->_owner);
Action::dispatch(); Action::dispatch();
if ((_actionIndex == 4) && (owner->_percent > 80)) if ((_actionIndex == 4) && (owner->_percent > 80))
owner->changeZoom(owner->_percent - 1); owner->changeZoom(owner->_percent - 1);
} }
@ -2134,7 +2134,7 @@ void Scene125::Action6::dispatch() {
SceneObject *owner = static_cast<SceneObject *>(this->_owner); SceneObject *owner = static_cast<SceneObject *>(this->_owner);
Action::dispatch(); Action::dispatch();
if ((_actionIndex == 2) && (owner->_percent < 100)) if ((_actionIndex == 2) && (owner->_percent < 100))
owner->changeZoom(owner->_percent + 1); owner->changeZoom(owner->_percent + 1);
} }
@ -2169,7 +2169,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player._moveDiff.x = 6; BF_GLOBALS._player._moveDiff.x = 6;
BF_GLOBALS._player._moveDiff.y = 6; BF_GLOBALS._player._moveDiff.y = 6;
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
_object5.postInit(); _object5.postInit();
_object5.setVisage(128); _object5.setVisage(128);
_object5.setPosition(Common::Point(150, 117)); _object5.setPosition(Common::Point(150, 117));
@ -2457,7 +2457,7 @@ void Scene160::Action1::signal() {
scene->_kid.setStrip(2); scene->_kid.setStrip(2);
scene->_kid.animate(ANIM_MODE_5, this); scene->_kid.animate(ANIM_MODE_5, this);
scene->_kidBody.setPosition(scene->_kid._position); scene->_kidBody.setPosition(scene->_kid._position);
scene->_kidBody.setFrame(1); scene->_kidBody.setFrame(1);
scene->_kidBody.setStrip(3); scene->_kidBody.setStrip(3);
break; break;
@ -2630,7 +2630,7 @@ void Scene160::Action2::signal() {
break; break;
case 25: case 25:
BF_GLOBALS._sound1.fade(0, 10, 10, true, this); BF_GLOBALS._sound1.fade(0, 10, 10, true, this);
// FIXME: Currently, fade() doesn't end properly with this song, // FIXME: Currently, fade() doesn't end properly with this song,
// thus never returns here. This hack skips the wait and changes // thus never returns here. This hack skips the wait and changes
// directly to the next scene // directly to the next scene
// Start of hack // Start of hack
@ -2895,7 +2895,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
_vechile.setStrip(3); _vechile.setStrip(3);
_vechile._frame = 5; _vechile._frame = 5;
_vechile.changeZoom(75); _vechile.changeZoom(75);
_dispatchMode = 1; _dispatchMode = 1;
_vechile._moveDiff.x = 45; _vechile._moveDiff.x = 45;
} else { } else {

4
engines/tsage/blue_force/blueforce_scenes1.h
View File

@ -137,7 +137,7 @@ class Scene110: public SceneExt {
virtual void signal(); virtual void signal();
}; };
public: public:
NamedObject _object1, _object2, _object3, _object4, _object5, _object6, _object7, _object8, _object9, _object10; NamedObject _object1, _object2, _object3, _object4, _object5, _object6, _object7, _object8, _object9, _object10;
ASound _sound; ASound _sound;
Action1 _action1; Action1 _action1;
Action2 _action2; Action2 _action2;
@ -354,7 +354,7 @@ public:
NamedObject _object1; NamedObject _object1;
NamedObject _object2; NamedObject _object2;
IntroSceneText _text; IntroSceneText _text;
void postInit(SceneObjectList *OwnerList); void postInit(SceneObjectList *OwnerList);
}; };

42
engines/tsage/blue_force/blueforce_scenes2.cpp
View File

@ -67,7 +67,7 @@ void Scene200::Action1::signal() {
rot->setDelay(10); rot->setDelay(10);
rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1); rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
rot->setDelay(10); rot->setDelay(10);
scene->setAction(&scene->_sequenceManager, this, 201, &scene->_object1, &scene->_object2, scene->setAction(&scene->_sequenceManager, this, 201, &scene->_object1, &scene->_object2,
&scene->_object3, &scene->_object4, &scene->_object5, &scene->_object6, NULL); &scene->_object3, &scene->_object4, &scene->_object5, &scene->_object6, NULL);
break; break;
@ -99,7 +99,7 @@ void Scene200::Action2::signal() {
break; break;
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@ -133,7 +133,7 @@ void Scene200::postInit(SceneObjectList *OwnerList) {
_object11.setVisage(200); _object11.setVisage(200);
_object11.setPosition(Common::Point(96, 112), 1000); _object11.setPosition(Common::Point(96, 112), 1000);
_object11.setStrip(3); _object11.setStrip(3);
_object11.setFrame(1); _object11.setFrame(1);
_object11.changeZoom(100); _object11.changeZoom(100);
_object10.setAction(&_action1); _object10.setAction(&_action1);
@ -168,7 +168,7 @@ void Scene210::Action1::signal() {
rot->setDelay(10); rot->setDelay(10);
rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1); rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
rot->setDelay(10); rot->setDelay(10);
scene->setAction(&scene->_sequenceManager, this, 210, &scene->_object10, &scene->_object11, scene->setAction(&scene->_sequenceManager, this, 210, &scene->_object10, &scene->_object11,
&scene->_object12, &scene->_object13, &scene->_object14, &scene->_object15, NULL); &scene->_object12, &scene->_object13, &scene->_object14, &scene->_object15, NULL);
break; break;
@ -301,7 +301,7 @@ void Scene220::Action1::signal() {
rot->setDelay(10); rot->setDelay(10);
rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1); rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
rot->setDelay(10); rot->setDelay(10);
scene->setAction(&scene->_sequenceManager, this, 220, &scene->_object4, &scene->_object5, scene->setAction(&scene->_sequenceManager, this, 220, &scene->_object4, &scene->_object5,
&scene->_object6, &scene->_object7, &scene->_object8, &scene->_object9, NULL); &scene->_object6, &scene->_object7, &scene->_object8, &scene->_object9, NULL);
break; break;
@ -508,7 +508,7 @@ void Scene225::Action1::signal() {
rot->setDelay(10); rot->setDelay(10);
rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1); rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
rot->setDelay(10); rot->setDelay(10);
scene->setAction(&scene->_sequenceManager, this, 225, &scene->_object15, &scene->_object16, scene->setAction(&scene->_sequenceManager, this, 225, &scene->_object15, &scene->_object16,
&scene->_object17, &scene->_object18, &scene->_object19, &scene->_object20, NULL); &scene->_object17, &scene->_object18, &scene->_object19, &scene->_object20, NULL);
break; break;
@ -661,7 +661,7 @@ void Scene225::postInit(SceneObjectList *OwnerList) {
_object11._frame = 1; _object11._frame = 1;
_object11.changeZoom(100); _object11.changeZoom(100);
_object11._numFrames = 2; _object11._numFrames = 2;
_object12.postInit(); _object12.postInit();
_object12.setVisage(1225); _object12.setVisage(1225);
_object12.setPosition(Common::Point(368, 35)); _object12.setPosition(Common::Point(368, 35));
@ -1007,14 +1007,14 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player._moveDiff.x = 8; BF_GLOBALS._player._moveDiff.x = 8;
BF_GLOBALS._player.changeZoom(-1); BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
switch (BF_GLOBALS._sceneManager._previousScene) { switch (BF_GLOBALS._sceneManager._previousScene) {
case 560: case 560:
if (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard) { if (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard) {
_field219A = 1; _field219A = 1;
BF_GLOBALS._player._moveDiff.x = 5; BF_GLOBALS._player._moveDiff.x = 5;
_field386 = 0; _field386 = 0;
_grandma.animate(ANIM_MODE_1, NULL); _grandma.animate(ANIM_MODE_1, NULL);
setAction(&_sequenceManager1, NULL, 2720, &BF_GLOBALS._player, &_grandma, NULL); setAction(&_sequenceManager1, NULL, 2720, &BF_GLOBALS._player, &_grandma, NULL);
BF_GLOBALS._bookmark = bLyleStoppedBy; BF_GLOBALS._bookmark = bLyleStoppedBy;
@ -1138,7 +1138,7 @@ void Scene270::signal() {
case 2717: case 2717:
_sceneMode = 2718; _sceneMode = 2718;
_lyle.setFrame2(-1); _lyle.setFrame2(-1);
setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_laura, &_skip, setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_laura, &_skip,
&_lyle, &_grandma, NULL); &_lyle, &_grandma, NULL);
break; break;
case 2718: case 2718:
@ -1167,7 +1167,7 @@ void Scene270::signal() {
break; break;
default: default:
break; break;
} }
} }
void Scene270::process(Event &event) { void Scene270::process(Event &event) {
@ -1374,7 +1374,7 @@ Scene271::Scene271() {
void Scene271::synchronize(Serializer &s) { void Scene271::synchronize(Serializer &s) {
PalettedScene::synchronize(s); PalettedScene::synchronize(s);
s.syncAsSint16LE(_field796); s.syncAsSint16LE(_field796);
s.syncAsSint16LE(_field2E16); s.syncAsSint16LE(_field2E16);
s.syncAsSint16LE(_tempPos.x); s.syncAsSint16LE(_tempPos.x);
@ -1396,7 +1396,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
_stripManager.addSpeaker(&_gameTextSpeaker); _stripManager.addSpeaker(&_gameTextSpeaker);
_stripManager.addSpeaker(&_granTextSpeaker); _stripManager.addSpeaker(&_granTextSpeaker);
_stripManager.addSpeaker(&_lyleTextSpeaker); _stripManager.addSpeaker(&_lyleTextSpeaker);
_exit.setDetails(Rect(310, 115, 320, 167), 270, -1, -1, -1, 1, NULL); _exit.setDetails(Rect(310, 115, 320, 167), 270, -1, -1, -1, 1, NULL);
_tv.postInit(); _tv.postInit();
@ -1433,7 +1433,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
_item2.setDetails(3, 270, 24, 25, 26, 1); _item2.setDetails(3, 270, 24, 25, 26, 1);
_item4.setDetails(2, 270, 30, 31, 32, 1); _item4.setDetails(2, 270, 30, 31, 32, 1);
_item11.setDetails(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y), 270, 0, 1, 2, 1, NULL); _item11.setDetails(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y), 270, 0, 1, 2, 1, NULL);
BF_GLOBALS._player.postInit(); BF_GLOBALS._player.postInit();
BF_GLOBALS._player._moveDiff.x = 8; BF_GLOBALS._player._moveDiff.x = 8;
BF_GLOBALS._player.changeZoom(-1); BF_GLOBALS._player.changeZoom(-1);
@ -1477,7 +1477,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
_object11.setStrip(1); _object11.setStrip(1);
_object11._frame = 2; _object11._frame = 2;
_object11.setPosition(Common::Point(35, 136)); _object11.setPosition(Common::Point(35, 136));
_object6.postInit(); _object6.postInit();
_object6.hide(); _object6.hide();
@ -1508,15 +1508,15 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
_object7.setVisage(277); _object7.setVisage(277);
_object7.setStrip(7); _object7.setStrip(7);
_object7.setPosition(Common::Point(48, 149)); _object7.setPosition(Common::Point(48, 149));
BF_GLOBALS._walkRegions.disableRegion(6); BF_GLOBALS._walkRegions.disableRegion(6);
BF_GLOBALS._walkRegions.disableRegion(14); BF_GLOBALS._walkRegions.disableRegion(14);
BF_GLOBALS._walkRegions.disableRegion(19); BF_GLOBALS._walkRegions.disableRegion(19);
_object12.postInit(); _object12.postInit();
_object12.setVisage(276); _object12.setVisage(276);
_object12.setPosition(Common::Point(129, 130)); _object12.setPosition(Common::Point(129, 130));
_object2.postInit(); _object2.postInit();
_object2.setVisage(270); _object2.setVisage(270);
_object2.setStrip(3); _object2.setStrip(3);
@ -1637,10 +1637,10 @@ void Scene271::signal() {
BF_GLOBALS._player.enableControl(); BF_GLOBALS._player.enableControl();
_field796 = 1; _field796 = 1;
_field2E16 = 1; _field2E16 = 1;
_object1.remove(); _object1.remove();
_object11.remove(); _object11.remove();
BF_INVENTORY.setObjectScene(INV_LYLE_CARD, 1); BF_INVENTORY.setObjectScene(INV_LYLE_CARD, 1);
break; break;
case 2709: case 2709:
@ -1754,7 +1754,7 @@ void Scene280::Action1::signal() {
scene->_jake.setFrame(1); scene->_jake.setFrame(1);
scene->_jake.animate(ANIM_MODE_8, NULL); scene->_jake.animate(ANIM_MODE_8, NULL);
scene->_jake._numFrames = 5; scene->_jake._numFrames = 5;
scene->_stripManager.start(2800, this); scene->_stripManager.start(2800, this);
break; break;
case 2: case 2:

8
engines/tsage/blue_force/blueforce_scenes3.cpp
View File

@ -945,7 +945,7 @@ void Scene315::Action1::signal() {
T2_GLOBALS._uiElements.addScore(30); T2_GLOBALS._uiElements.addScore(30);
BF_INVENTORY.setObjectScene(INV_MUG_SHOT, 1); BF_INVENTORY.setObjectScene(INV_MUG_SHOT, 1);
//HACK: This has to be checked wether or not it occurs in the original. //HACK: This has to be checked wether or not it occurs in the original.
//When the _sceneMode is set to 3169, the value desn't change. //When the _sceneMode is set to 3169, the value desn't change.
//If you show the forest rapsheet, it gives points (and again... and again...) //If you show the forest rapsheet, it gives points (and again... and again...)
scene->_sceneMode = 3154; scene->_sceneMode = 3154;
} }
@ -4509,12 +4509,12 @@ void Scene360::signal() {
break; break;
case 3607: case 3607:
case 3609: case 3609:
// Original game was only using at this place visage 1363. // Original game was only using at this place visage 1363.
// This workaround allow Harrison to keep his gun handy // This workaround allow Harrison to keep his gun handy
// when entering the romm (if required) // when entering the romm (if required)
if (! BF_GLOBALS.getFlag(gunDrawn)) if (! BF_GLOBALS.getFlag(gunDrawn))
_harrison.setVisage(1363); _harrison.setVisage(1363);
else else
_harrison.setVisage(363); _harrison.setVisage(363);
BF_GLOBALS._player.enableControl(); BF_GLOBALS._player.enableControl();
break; break;
@ -5365,7 +5365,7 @@ bool Scene385::Jim::startAction(CursorType action, Event &event) {
} else if (action < CURSOR_WALK) } else if (action < CURSOR_WALK)
// Any other inventory item // Any other inventory item
return false; return false;
else else
return NamedObject::startAction(action, event); return NamedObject::startAction(action, event);
} }

16
engines/tsage/blue_force/blueforce_scenes4.cpp
View File

@ -1083,7 +1083,7 @@ void Scene415::postInit(SceneObjectList *OwnerList) {
_animatedSeat.setStrip(1); _animatedSeat.setStrip(1);
_animatedSeat.setPosition(Common::Point(306, 116)); _animatedSeat.setPosition(Common::Point(306, 116));
_animatedSeat.fixPriority(80); _animatedSeat.fixPriority(80);
_windowLever.setDetails(16, 415, 25, -1, 26, 1); _windowLever.setDetails(16, 415, 25, -1, 26, 1);
_item7.setDetails(17, 415, 32, -1, 33, 1); _item7.setDetails(17, 415, 32, -1, 33, 1);
_seatBelt.setDetails(14, 415, 29, -1, 30, 1); _seatBelt.setDetails(14, 415, 29, -1, 30, 1);
@ -1271,7 +1271,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.setVisage(303); BF_GLOBALS._player.setVisage(303);
BF_GLOBALS._player.setPosition(Common::Point(187, 104)); BF_GLOBALS._player.setPosition(Common::Point(187, 104));
_lyle.setPosition(Common::Point(135, 128)); _lyle.setPosition(Common::Point(135, 128));
_lyle.show(); _lyle.show();
@ -1291,7 +1291,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
_vechile.setVisage(580); _vechile.setVisage(580);
_vechile.setStrip(2); _vechile.setStrip(2);
_vechile.setFrame(3); _vechile.setFrame(3);
BF_GLOBALS._player.setVisage(303); BF_GLOBALS._player.setVisage(303);
} }
} }
@ -1310,7 +1310,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
_lyle.setPosition(Common::Point(143, 93)); _lyle.setPosition(Common::Point(143, 93));
_lyle.setStrip(5); _lyle.setStrip(5);
_lyle.fixPriority(90); _lyle.fixPriority(90);
_doorway.setFrame(_doorway.getFrameCount()); _doorway.setFrame(_doorway.getFrameCount());
_sceneMode = 4401; _sceneMode = 4401;
setAction(&_sequenceManager, this, 4401, &BF_GLOBALS._player, &_doorway, NULL); setAction(&_sequenceManager, this, 4401, &BF_GLOBALS._player, &_doorway, NULL);
@ -1375,7 +1375,7 @@ bool Scene450::Weasel::startAction(CursorType action, Event &event) {
T2_GLOBALS._uiElements.addScore(30); T2_GLOBALS._uiElements.addScore(30);
scene->_sceneMode = 4505; scene->_sceneMode = 4505;
scene->setAction(&scene->_sequenceManager, scene, 4505, &BF_GLOBALS._player, this, scene->setAction(&scene->_sequenceManager, scene, 4505, &BF_GLOBALS._player, this,
&scene->_counterDoor, &scene->_object2, NULL); &scene->_counterDoor, &scene->_object2, NULL);
return true; return true;
default: default:
@ -1427,7 +1427,7 @@ bool Scene450::Manager::startAction(CursorType action, Event &event) {
if (BF_GLOBALS.getFlag(takenWeasel) && !BF_GLOBALS.getFlag(gotTrailer450)) { if (BF_GLOBALS.getFlag(takenWeasel) && !BF_GLOBALS.getFlag(gotTrailer450)) {
BF_GLOBALS.setFlag(gotTrailer450); BF_GLOBALS.setFlag(gotTrailer450);
scene->_sceneMode = 4517; scene->_sceneMode = 4517;
scene->setAction(&scene->_sequenceManager, scene, 4517, &BF_GLOBALS._player, this, scene->setAction(&scene->_sequenceManager, scene, 4517, &BF_GLOBALS._player, this,
&scene->_door, NULL); &scene->_door, NULL);
} else { } else {
animate(ANIM_MODE_8, 1, NULL); animate(ANIM_MODE_8, 1, NULL);
@ -1485,11 +1485,11 @@ bool Scene450::Manager::startAction(CursorType action, Event &event) {
} else { } else {
animate(ANIM_MODE_8, 1, NULL); animate(ANIM_MODE_8, 1, NULL);
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
if (!BF_GLOBALS.getFlag(showEugeneID)) if (!BF_GLOBALS.getFlag(showEugeneID))
T2_GLOBALS._uiElements.addScore(30); T2_GLOBALS._uiElements.addScore(30);
BF_GLOBALS.setFlag(showEugeneID); BF_GLOBALS.setFlag(showEugeneID);
if ((BF_GLOBALS.getFlag(showRapEugene) || BF_GLOBALS.getFlag(showEugeneNapkin)) && if ((BF_GLOBALS.getFlag(showRapEugene) || BF_GLOBALS.getFlag(showEugeneNapkin)) &&
!BF_GLOBALS.getFlag(fMgrCallsWeasel)) { !BF_GLOBALS.getFlag(fMgrCallsWeasel)) {
T2_GLOBALS._uiElements.addScore(30); T2_GLOBALS._uiElements.addScore(30);

62
engines/tsage/blue_force/blueforce_scenes5.cpp
View File

@ -60,7 +60,7 @@ bool Scene550::Lyle::startAction(CursorType action, Event &event) {
switch (action) { switch (action) {
case CURSOR_TALK: case CURSOR_TALK:
if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) || if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) ||
(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) { (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) && if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) &&
(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) { (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
@ -132,7 +132,7 @@ bool Scene550::Vechile::startAction(CursorType action, Event &event) {
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
scene->_sceneMode = 2; scene->_sceneMode = 2;
scene->setAction(&scene->_sequenceManager, scene, 5501, &BF_GLOBALS._player, NULL); scene->setAction(&scene->_sequenceManager, scene, 5501, &BF_GLOBALS._player, NULL);
} else if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) || } else if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) ||
(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) { (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
if (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1) { if (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1) {
scene->_sceneMode = 5501; scene->_sceneMode = 5501;
@ -164,11 +164,11 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
_sceneMode = 1; _sceneMode = 1;
signal(); signal();
return; return;
} }
SceneExt::postInit(); SceneExt::postInit();
loadScene(550); loadScene(550);
_stripManager.addSpeaker(&_gameTextSpeaker); _stripManager.addSpeaker(&_gameTextSpeaker);
_stripManager.addSpeaker(&_lyleHatSpeaker); _stripManager.addSpeaker(&_lyleHatSpeaker);
_stripManager.addSpeaker(&_jakeJacketSpeaker); _stripManager.addSpeaker(&_jakeJacketSpeaker);
@ -216,7 +216,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS.getFlag(onDuty)) { if (BF_GLOBALS.getFlag(onDuty)) {
_vechile.setVisage(301); _vechile.setVisage(301);
_vechile.setStrip(1); _vechile.setStrip(1);
BF_GLOBALS._player.setVisage(304); BF_GLOBALS._player.setVisage(304);
} else { } else {
_vechile.setVisage(580); _vechile.setVisage(580);
@ -224,7 +224,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
_vechile.setFrame(2); _vechile.setFrame(2);
BF_GLOBALS._player.setVisage(303); BF_GLOBALS._player.setVisage(303);
} }
} }
BF_GLOBALS._sceneItems.push_back(&_vechile); BF_GLOBALS._sceneItems.push_back(&_vechile);
@ -299,7 +299,7 @@ void Scene551::Action2::signal() {
BF_GLOBALS._walkRegions.enableRegion(18); BF_GLOBALS._walkRegions.enableRegion(18);
BF_GLOBALS._walkRegions.enableRegion(4); BF_GLOBALS._walkRegions.enableRegion(4);
scene->_field1CD2 = 1; scene->_field1CD2 = 1;
scene->_harrison.setObjectWrapper(new SceneObjectWrapper()); scene->_harrison.setObjectWrapper(new SceneObjectWrapper());
scene->_harrison.animate(ANIM_MODE_1, NULL); scene->_harrison.animate(ANIM_MODE_1, NULL);
@ -506,7 +506,7 @@ void Scene551::TrunkInset::remove() {
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
scene->_sceneMode = 0; scene->_sceneMode = 0;
scene->setAction(&scene->_sequenceManager, scene, 5516, &scene->_harrison, scene->setAction(&scene->_sequenceManager, scene, 5516, &scene->_harrison,
&scene->_patrolCarTrunk, NULL); &scene->_patrolCarTrunk, NULL);
FocusObject::remove(); FocusObject::remove();
@ -711,7 +711,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
_object12.show(); _object12.show();
_object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL); _object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL);
BF_GLOBALS._sceneItems.push_front(&_object12); BF_GLOBALS._sceneItems.push_front(&_object12);
_harrison.postInit(); _harrison.postInit();
_harrison.setVisage(304); _harrison.setVisage(304);
_harrison.setPosition(Common::Point(67, 102)); _harrison.setPosition(Common::Point(67, 102));
@ -1076,7 +1076,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
_item4.setDetails(Rect(143, 86, 159, 102), 560, 49, 50, -1, 1, NULL); _item4.setDetails(Rect(143, 86, 159, 102), 560, 49, 50, -1, 1, NULL);
_item5.setDetails(Rect(159, 86, 175, 102), 560, 49, 50, -1, 1, NULL); _item5.setDetails(Rect(159, 86, 175, 102), 560, 49, 50, -1, 1, NULL);
_item6.setDetails(Rect(175, 86, 191, 102), 560, 49, 50, -1, 1, NULL); _item6.setDetails(Rect(175, 86, 191, 102), 560, 49, 50, -1, 1, NULL);
BF_GLOBALS._sceneItems.remove(&_item1); BF_GLOBALS._sceneItems.remove(&_item1);
BF_GLOBALS._sceneItems.remove(&_item2); BF_GLOBALS._sceneItems.remove(&_item2);
BF_GLOBALS._sceneItems.remove(&_item3); BF_GLOBALS._sceneItems.remove(&_item3);
@ -1114,9 +1114,9 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
_digit0.setStrip(3); _digit0.setStrip(3);
_digit0.setPosition(Common::Point(183, 94)); _digit0.setPosition(Common::Point(183, 94));
_digit0.fixPriority(252); _digit0.fixPriority(252);
int amount = (BF_GLOBALS._safeCombination != 0) ? BF_GLOBALS._safeCombination : 1000; int amount = (BF_GLOBALS._safeCombination != 0) ? BF_GLOBALS._safeCombination : 1000;
// Get digit 0 portion // Get digit 0 portion
int remainder = amount % 10; int remainder = amount % 10;
amount /= 10; amount /= 10;
@ -1135,7 +1135,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
void Scene560::SafeInset::remove() { void Scene560::SafeInset::remove() {
Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene; Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene;
_item1.remove(); _item1.remove();
_item2.remove(); _item2.remove();
_item3.remove(); _item3.remove();
@ -1145,7 +1145,7 @@ void Scene560::SafeInset::remove() {
_digit2.remove(); _digit2.remove();
_digit1.remove(); _digit1.remove();
_digit0.remove(); _digit0.remove();
scene->_nickel.remove(); scene->_nickel.remove();
if (BF_GLOBALS._events.getCursor() == CURSOR_USE) { if (BF_GLOBALS._events.getCursor() == CURSOR_USE) {
@ -1293,7 +1293,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
default: default:
break; break;
} }
scene->_safeInset.signal(); scene->_safeInset.signal();
scene->_sound1.play(75); scene->_sound1.play(75);
return true; return true;
@ -1345,7 +1345,7 @@ bool Scene560::BoxInset::Item1::startAction(CursorType action, Event &event) {
scene->_safeInset.setPosition(Common::Point(160, 141)); scene->_safeInset.setPosition(Common::Point(160, 141));
scene->_safeInset.fixPriority(251); scene->_safeInset.fixPriority(251);
scene->_safeInset.setDetails(560, 45, 46, -1); scene->_safeInset.setDetails(560, 45, 46, -1);
scene->_sceneMode = 3; scene->_sceneMode = 3;
scene->_boxInset.remove(); scene->_boxInset.remove();
@ -1414,7 +1414,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
_deskChair.setPosition(Common::Point(81, 149)); _deskChair.setPosition(Common::Point(81, 149));
_deskChair.fixPriority(151); _deskChair.fixPriority(151);
_deskChair.changeZoom(81); _deskChair.changeZoom(81);
if (BF_GLOBALS._sceneManager._previousScene == 570) { if (BF_GLOBALS._sceneManager._previousScene == 570) {
// Returning from using computer // Returning from using computer
BF_GLOBALS._events.setCursor(CURSOR_USE); BF_GLOBALS._events.setCursor(CURSOR_USE);
@ -1448,7 +1448,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player._moveDiff.x = 11; BF_GLOBALS._player._moveDiff.x = 11;
BF_GLOBALS._player.changeZoom(-1); BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
_sceneMode = 10; _sceneMode = 10;
ADD_MOVER(BF_GLOBALS._player, 85, 115); ADD_MOVER(BF_GLOBALS._player, 85, 115);
} }
@ -1516,7 +1516,7 @@ void Scene560::signal() {
T2_GLOBALS._uiElements.addScore(10); T2_GLOBALS._uiElements.addScore(10);
BF_GLOBALS.setFlag(fGotPointsForPunch); BF_GLOBALS.setFlag(fGotPointsForPunch);
} }
_boxInset.postInit(); _boxInset.postInit();
_boxInset.setVisage(560); _boxInset.setVisage(560);
_boxInset.setStrip(2); _boxInset.setStrip(2);
@ -1605,7 +1605,7 @@ void Scene570::PasswordEntry::postInit(SceneObjectList *OwnerList) {
void Scene570::PasswordEntry::process(Event &event) { void Scene570::PasswordEntry::process(Event &event) {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
bool entryChanged = false; bool entryChanged = false;
switch (event.eventType) { switch (event.eventType) {
case EVENT_KEYPRESS: { case EVENT_KEYPRESS: {
int key = toupper(event.kbd.ascii); int key = toupper(event.kbd.ascii);
@ -1648,7 +1648,7 @@ void Scene570::PasswordEntry::process(Event &event) {
_entryText.setPosition(Common::Point(213, 40)); _entryText.setPosition(Common::Point(213, 40));
_entryText.fixPriority(255); _entryText.fixPriority(255);
_entryText.setup(_entryBuffer); _entryText.setup(_entryBuffer);
// Pad entered text with spaces to make up the allowed width and then display // Pad entered text with spaces to make up the allowed width and then display
Common::String msg = _entryBuffer; Common::String msg = _entryBuffer;
while (msg.size() < 10) while (msg.size() < 10)
@ -1658,7 +1658,7 @@ void Scene570::PasswordEntry::process(Event &event) {
} }
void Scene570::PasswordEntry::checkPassword() { void Scene570::PasswordEntry::checkPassword() {
// Check if the password is correctly entered as 'JACKIE' or, as a nod to the // Check if the password is correctly entered as 'JACKIE' or, as a nod to the
// reimplementation in ScummVM, as the project name. // reimplementation in ScummVM, as the project name.
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
@ -1794,7 +1794,7 @@ void Scene570::Icon::remove() {
} }
bool Scene570::Icon::startAction(CursorType action, Event &event) { bool Scene570::Icon::startAction(CursorType action, Event &event) {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
@ -1907,7 +1907,7 @@ bool Scene570::Icon::startAction(CursorType action, Event &event) {
} }
void Scene570::Icon::setDetails(int iconId, int folderId, int parentFolderId, int unused, const Common::String &msg) { void Scene570::Icon::setDetails(int iconId, int folderId, int parentFolderId, int unused, const Common::String &msg) {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
NamedObject::postInit(); NamedObject::postInit();
_iconId = iconId; _iconId = iconId;
@ -1929,7 +1929,7 @@ void Scene570::Icon::setDetails(int iconId, int folderId, int parentFolderId, in
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
bool Scene570::PowerSwitch::startAction(CursorType action, Event &event) { bool Scene570::PowerSwitch::startAction(CursorType action, Event &event) {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_USE: case CURSOR_USE:
@ -1972,7 +1972,7 @@ bool Scene570::PrinterIcon::startAction(CursorType action, Event &event) {
} }
void Scene570::Object3::remove() { void Scene570::Object3::remove() {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
scene->_object4._flag = 0; scene->_object4._flag = 0;
scene->_printerIcon.remove(); scene->_printerIcon.remove();
@ -1998,7 +1998,7 @@ void Scene570::Object3::remove() {
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
bool Scene570::FloppyDrive::startAction(CursorType action, Event &event) { bool Scene570::FloppyDrive::startAction(CursorType action, Event &event) {
Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene; Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
switch (action) { switch (action) {
case CURSOR_USE: case CURSOR_USE:
@ -2326,7 +2326,7 @@ bool Scene590::Skip::startAction(CursorType action, Event &event) {
} else { } else {
scene->_stripNumber = !scene->_field17DC ? 5901 : 5902; scene->_stripNumber = !scene->_field17DC ? 5901 : 5902;
} }
scene->setAction(&scene->_action1); scene->setAction(&scene->_action1);
scene->_field17DC = 1; scene->_field17DC = 1;
return true; return true;
@ -2404,7 +2404,7 @@ void Scene590::Action2::signal() {
case 4: case 4:
scene->_skip.setStrip(1); scene->_skip.setStrip(1);
scene->_skip.animate(ANIM_MODE_1, NULL); scene->_skip.animate(ANIM_MODE_1, NULL);
BF_GLOBALS._player.setVisage(368); BF_GLOBALS._player.setVisage(368);
BF_GLOBALS._player.setStrip(7); BF_GLOBALS._player.setStrip(7);
BF_GLOBALS._player.setPosition(Common::Point(238, 131)); BF_GLOBALS._player.setPosition(Common::Point(238, 131));
@ -2456,7 +2456,7 @@ void Scene590::postInit(SceneObjectList *OwnerList) {
_stripManager.addSpeaker(&_skipSpeaker); _stripManager.addSpeaker(&_skipSpeaker);
_stripManager.addSpeaker(&_lauraSpeaker); _stripManager.addSpeaker(&_lauraSpeaker);
_stripManager.addSpeaker(&_jakeJacketSpeaker); _stripManager.addSpeaker(&_jakeJacketSpeaker);
if (BF_GLOBALS.getFlag(onDuty)) { if (BF_GLOBALS.getFlag(onDuty)) {
BF_GLOBALS._player.setVisage(361); BF_GLOBALS._player.setVisage(361);
BF_GLOBALS._player._moveDiff = Common::Point(6, 2); BF_GLOBALS._player._moveDiff = Common::Point(6, 2);
@ -2488,7 +2488,7 @@ void Scene590::postInit(SceneObjectList *OwnerList) {
_item10.setDetails(13, 590, 9, -1, 21, 1); _item10.setDetails(13, 590, 9, -1, 21, 1);
_item11.setDetails(15, 590, 10, -1, 22, 1); _item11.setDetails(15, 590, 10, -1, 22, 1);
_item12.setDetails(17, 590, 11, -1, 23, 1); _item12.setDetails(17, 590, 11, -1, 23, 1);
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
_sceneMode = 0; _sceneMode = 0;
setAction(&_sequenceManager, this, 5900, &BF_GLOBALS._player, NULL); setAction(&_sequenceManager, this, 5900, &BF_GLOBALS._player, NULL);

2
engines/tsage/blue_force/blueforce_scenes5.h
View File

@ -228,7 +228,7 @@ public:
NamedHotspot _chair, _lamp, _item4, _trophy, _watercolours, _fileCabinets; NamedHotspot _chair, _lamp, _item4, _trophy, _watercolours, _fileCabinets;
NamedHotspot _certificate, _bookcase, _desk, _carpet, _item12, _office; NamedHotspot _certificate, _bookcase, _desk, _carpet, _item12, _office;
ASound _sound1; ASound _sound1;
bool _field380; bool _field380;
bool _field11EA; bool _field11EA;
Common::Point _destPosition; Common::Point _destPosition;

10
engines/tsage/blue_force/blueforce_scenes6.cpp
View File

@ -49,7 +49,7 @@ void Scene600::Action1::signal() {
break; break;
case 2: case 2:
scene->_sound1.play(59); scene->_sound1.play(59);
setAction(&scene->_sequenceManager, this, 600, &scene->_object2, &scene->_ryan, setAction(&scene->_sequenceManager, this, 600, &scene->_object2, &scene->_ryan,
&BF_GLOBALS._player, &scene->_skidMarks, NULL); &BF_GLOBALS._player, &scene->_skidMarks, NULL);
break; break;
case 3: case 3:
@ -149,7 +149,7 @@ void Scene600::remove() {
void Scene620::postInit(SceneObjectList *OwnerList) { void Scene620::postInit(SceneObjectList *OwnerList) {
SceneExt::postInit(); SceneExt::postInit();
loadScene(999); loadScene(999);
BF_GLOBALS._player.postInit(); BF_GLOBALS._player.postInit();
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
BF_GLOBALS._player.setVisage(621); BF_GLOBALS._player.setVisage(621);
@ -176,14 +176,14 @@ void Scene620::signal() {
case 13: case 13:
case 16: case 16:
case 19: case 19:
addFader((const byte *)&black, 2, this); addFader((const byte *)&black, 2, this);
break; break;
case 2: case 2:
BF_GLOBALS._player.remove(); BF_GLOBALS._player.remove();
_object1.postInit(); _object1.postInit();
_object1.setVisage(622); _object1.setVisage(622);
_object1.setPosition(Common::Point(101, 41)); _object1.setPosition(Common::Point(101, 41));
add2Faders((const byte *)&black, 2, 622, this); add2Faders((const byte *)&black, 2, 622, this);
break; break;
case 5: case 5:
_object1.remove(); _object1.remove();
@ -441,7 +441,7 @@ void Scene690::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._dayNumber = 1; BF_GLOBALS._dayNumber = 1;
_stripManager.addSpeaker(&_jakeSpeaker); _stripManager.addSpeaker(&_jakeSpeaker);
_object1.postInit(); _object1.postInit();
_object1.setVisage(690); _object1.setVisage(690);
_object1.setStrip2(2); _object1.setStrip2(2);

34
engines/tsage/blue_force/blueforce_scenes8.cpp
View File

@ -434,7 +434,7 @@ void Scene810::Action2::signal() {
scene->_lyle.setVisage(813); scene->_lyle.setVisage(813);
scene->_lyle.setStrip(2); scene->_lyle.setStrip(2);
scene->_lyle.setFrame(1); scene->_lyle.setFrame(1);
ADD_PLAYER_MOVER(84, 113); ADD_PLAYER_MOVER(84, 113);
break; break;
case 5: case 5:
@ -611,7 +611,7 @@ bool Scene810::Lyle::startAction(CursorType action, Event &event) {
default: default:
return NamedObjectExt::startAction(action, event); return NamedObjectExt::startAction(action, event);
} }
} }
bool Scene810::Chair::startAction(CursorType action, Event &event) { bool Scene810::Chair::startAction(CursorType action, Event &event) {
switch (action) { switch (action) {
@ -709,7 +709,7 @@ bool Scene810::Object5::startAction(CursorType action, Event &event) {
case CURSOR_USE: { case CURSOR_USE: {
scene->_sceneMode = 8195; scene->_sceneMode = 8195;
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
PlayerMover *mover = new PlayerMover(); PlayerMover *mover = new PlayerMover();
Common::Point destPos(67, 111); Common::Point destPos(67, 111);
BF_GLOBALS._player.addMover(mover, &destPos, scene); BF_GLOBALS._player.addMover(mover, &destPos, scene);
@ -804,7 +804,7 @@ bool Scene810::FaxMachine::startAction(CursorType action, Event &event) {
scene->_sceneMode = 811; scene->_sceneMode = 811;
if (BF_GLOBALS._sceneObjects->contains(&scene->_lyle)) { if (BF_GLOBALS._sceneObjects->contains(&scene->_lyle)) {
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8108 : 8105, scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8108 : 8105,
&BF_GLOBALS._player, &scene->_object6, NULL); &BF_GLOBALS._player, &scene->_object6, NULL);
} else { } else {
scene->setAction(&scene->_sequenceManager1, scene, 8111, &BF_GLOBALS._player, scene->setAction(&scene->_sequenceManager1, scene, 8111, &BF_GLOBALS._player,
@ -1058,12 +1058,12 @@ void Scene810::postInit(SceneObjectList *OwnerList) {
case 820: case 820:
BF_GLOBALS._player.setStrip(7); BF_GLOBALS._player.setStrip(7);
BF_GLOBALS._player.setPosition(Common::Point(278, 116)); BF_GLOBALS._player.setPosition(Common::Point(278, 116));
_lyle.setVisage(845); _lyle.setVisage(845);
_lyle.setPosition(Common::Point(340, 175)); _lyle.setPosition(Common::Point(340, 175));
_lyle.setObjectWrapper(new SceneObjectWrapper()); _lyle.setObjectWrapper(new SceneObjectWrapper());
_lyle.animate(ANIM_MODE_1, NULL); _lyle.animate(ANIM_MODE_1, NULL);
_chair.show(); _chair.show();
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
@ -1121,7 +1121,7 @@ void Scene810::postInit(SceneObjectList *OwnerList) {
_item12._sceneRegionId = 8; _item12._sceneRegionId = 8;
BF_GLOBALS._sceneItems.push_back(&_item12); BF_GLOBALS._sceneItems.push_back(&_item12);
BF_GLOBALS._sceneItems.addItems(&_microficheReader, &_map, &_window, &_bookcase, &_garbageCan, BF_GLOBALS._sceneItems.addItems(&_microficheReader, &_map, &_window, &_bookcase, &_garbageCan,
&_fileCabinets, &_coffeeMaker, &_shelves, &_background, NULL); &_fileCabinets, &_coffeeMaker, &_shelves, &_background, NULL);
_background.setBounds(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y)); _background.setBounds(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y));
} }
@ -1276,7 +1276,7 @@ void Scene810::dispatch() {
_lyle.updateAngle(BF_GLOBALS._player._position); _lyle.updateAngle(BF_GLOBALS._player._position);
} }
if (BF_GLOBALS._sceneObjects->contains(&_faxMachineInset) && (BF_GLOBALS._player._position.x != 67) && if (BF_GLOBALS._sceneObjects->contains(&_faxMachineInset) && (BF_GLOBALS._player._position.x != 67) &&
(BF_GLOBALS._player._position.y != 111)) { (BF_GLOBALS._player._position.y != 111)) {
_faxMachineInset.remove(); _faxMachineInset.remove();
} }
@ -1341,7 +1341,7 @@ bool Scene820::PowerButton::startAction(CursorType action, Event &event) {
BF_GLOBALS._scenePalette.loadPalette(821); BF_GLOBALS._scenePalette.loadPalette(821);
BF_GLOBALS._scenePalette.refresh(); BF_GLOBALS._scenePalette.refresh();
SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END); SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
} else { } else {
BF_GLOBALS._scenePalette.loadPalette(820); BF_GLOBALS._scenePalette.loadPalette(820);
@ -1388,7 +1388,7 @@ bool Scene820::BackButton::startAction(CursorType action, Event &event) {
scene->_object5.hide(); scene->_object5.hide();
} }
SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END); SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
return true; return true;
default: default:
@ -1419,7 +1419,7 @@ bool Scene820::ForwardButton::startAction(CursorType action, Event &event) {
if (scene->_pageNumber < 4) if (scene->_pageNumber < 4)
++scene->_pageNumber; ++scene->_pageNumber;
SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END); SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
if (scene->_pageNumber == 4) { if (scene->_pageNumber == 4) {
@ -1447,7 +1447,7 @@ void Scene820::synchronize(Serializer &s) {
void Scene820::postInit(SceneObjectList *OwnerList) { void Scene820::postInit(SceneObjectList *OwnerList) {
SceneExt::postInit(); SceneExt::postInit();
loadScene(820); loadScene(820);
_stripManager.addSpeaker(&_gameTextSpeaker); _stripManager.addSpeaker(&_gameTextSpeaker);
_powerButton.postInit(); _powerButton.postInit();
@ -3115,7 +3115,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
_lyle.setPosition(Common::Point(156, 148)); _lyle.setPosition(Common::Point(156, 148));
_lyle.fixPriority(149); _lyle.fixPriority(149);
} }
if ((BF_INVENTORY.getObjectScene(INV_HANDCUFFS) != 1) && if ((BF_INVENTORY.getObjectScene(INV_HANDCUFFS) != 1) &&
(BF_INVENTORY.getObjectScene(INV_GRENADES) == 355)) { (BF_INVENTORY.getObjectScene(INV_GRENADES) == 355)) {
_object4.postInit(); _object4.postInit();
@ -3135,7 +3135,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
} }
break; break;
} }
_boat.setDetails(7, 870, 3, 4, 5, 1); _boat.setDetails(7, 870, 3, 4, 5, 1);
_crate.setDetails(14, 870, 12, 13, 14, 1); _crate.setDetails(14, 870, 12, 13, 14, 1);
_water.setDetails(5, 870, 24, 25, 26, 1); _water.setDetails(5, 870, 24, 25, 26, 1);
@ -3393,7 +3393,7 @@ void Scene880::postInit(SceneObjectList *OwnerList) {
_object4.setFrame2(_object4.getFrameCount()); _object4.setFrame2(_object4.getFrameCount());
_object4.fixPriority(160); _object4.fixPriority(160);
_object4.setPosition(Common::Point(255, 148)); _object4.setPosition(Common::Point(255, 148));
_seqNumber = 8816; _seqNumber = 8816;
} else if (BF_GLOBALS.getFlag(fBlowUpGoon)) { } else if (BF_GLOBALS.getFlag(fBlowUpGoon)) {
_object4.setStrip(7); _object4.setStrip(7);
@ -3405,7 +3405,7 @@ void Scene880::postInit(SceneObjectList *OwnerList) {
} else { } else {
_object4.setStrip(2); _object4.setStrip(2);
_object4.setPosition(Common::Point(258, 147)); _object4.setPosition(Common::Point(258, 147));
_object3.postInit(); _object3.postInit();
_object3.setVisage(871); _object3.setVisage(871);
_object3.setStrip(4); _object3.setStrip(4);
@ -3600,7 +3600,7 @@ void Scene880::handleAction(Action *action) {
action->_owner = NULL; action->_owner = NULL;
} }
} }
void Scene880::dispatch() { void Scene880::dispatch() {
SceneExt::dispatch(); SceneExt::dispatch();

6
engines/tsage/blue_force/blueforce_scenes9.cpp
View File

@ -386,7 +386,7 @@ void Scene900::Action3::signal() {
break; break;
default: default:
break; break;
} }
} }
void Scene900::Action4::signal() { void Scene900::Action4::signal() {
@ -540,7 +540,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL); _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
_lyle.animate(ANIM_MODE_1, NULL); _lyle.animate(ANIM_MODE_1, NULL);
_lyle.setObjectWrapper(new SceneObjectWrapper()); _lyle.setObjectWrapper(new SceneObjectWrapper());
} }
_sceneMode = 9000; _sceneMode = 9000;
setAction(&_sequenceManager1, this, 9000, &BF_GLOBALS._player, NULL); setAction(&_sequenceManager1, this, 9000, &BF_GLOBALS._player, NULL);
@ -2125,7 +2125,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
_lyle.setFrame(3); _lyle.setFrame(3);
_lyle._field90 = 1; _lyle._field90 = 1;
_lyle.setDetails(910, 69, 70 ,71 , 5, &_item4); _lyle.setDetails(910, 69, 70 ,71 , 5, &_item4);
BF_GLOBALS._walkRegions.disableRegion(15); BF_GLOBALS._walkRegions.disableRegion(15);
BF_GLOBALS._walkRegions.disableRegion(16); BF_GLOBALS._walkRegions.disableRegion(16);
BF_GLOBALS._walkRegions.disableRegion(14); BF_GLOBALS._walkRegions.disableRegion(14);

6
engines/tsage/debugger.cpp
View File

@ -305,7 +305,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
if (ri != g_globals->_sceneRegions.end()) { if (ri != g_globals->_sceneRegions.end()) {
// Fill out the areas defined by the region // Fill out the areas defined by the region
Region &r = *ri; Region &r = *ri;
for (int y = r._bounds.top; y < r._bounds.bottom; ++y) { for (int y = r._bounds.top; y < r._bounds.bottom; ++y) {
LineSliceSet set = r.getLineSlices(y); LineSliceSet set = r.getLineSlices(y);
@ -615,7 +615,7 @@ bool BlueForceDebugger::Cmd_MoveObject(int argc, const char **argv) {
if ((objNum > 0) && (objNum < 65)) if ((objNum > 0) && (objNum < 65))
BF_INVENTORY.setObjectScene(objNum, sceneNum); BF_INVENTORY.setObjectScene(objNum, sceneNum);
else else
DebugPrintf("Invalid object Id %s\n", argv[1]); DebugPrintf("Invalid object Id %s\n", argv[1]);
return true; return true;
@ -702,7 +702,7 @@ bool Ringworld2Debugger::Cmd_MoveObject(int argc, const char **argv) {
if ((objNum > 0) && (objNum < 53)) if ((objNum > 0) && (objNum < 53))
R2_INVENTORY.setObjectScene(objNum, sceneNum); R2_INVENTORY.setObjectScene(objNum, sceneNum);
else else
DebugPrintf("Invalid object Id %s\n", argv[1]); DebugPrintf("Invalid object Id %s\n", argv[1]);
return true; return true;

28
engines/tsage/events.h
View File

@ -86,25 +86,25 @@ enum CursorType {
INV_CARAVAN_KEY = 67, BF_LAST_INVENT = 68, INV_CARAVAN_KEY = 67, BF_LAST_INVENT = 68,
// Ringworld 2 objects // Ringworld 2 objects
R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4,
R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7, R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7,
R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10, R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10,
R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13, R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13,
R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16, R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20, R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20,
R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23, R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26, R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26,
R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30, R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30,
R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34, R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34,
R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38, R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38,
R2_COM_SCANNER_2 = 39, R2_SUPERCONDUCTOR_WIRE = 40, R2_PILLOW = 41, R2_FOOD_TRAY = 42, R2_COM_SCANNER_2 = 39, R2_SUPERCONDUCTOR_WIRE = 40, R2_PILLOW = 41, R2_FOOD_TRAY = 42,
R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46, R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46,
R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50, R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50,
R2_BROKEN_DISPLAY = 51, R2_TOOLBOX = 52, R2_LAST_INVENT = 53, R2_BROKEN_DISPLAY = 51, R2_TOOLBOX = 52, R2_LAST_INVENT = 53,
// Ringworld 2 cursors // Ringworld 2 cursors
R2CURSORS_START = 0x8000, EXITCURSOR_N = 0x8007, EXITCURSOR_S = 0x8008, EXITCURSOR_W = 0x8009, R2CURSORS_START = 0x8000, EXITCURSOR_N = 0x8007, EXITCURSOR_S = 0x8008, EXITCURSOR_W = 0x8009,
EXITCURSOR_E = 0x800A, EXITCURSOR_LEFT_HAND = 0x800B, CURSOR_INVALID = 0x800C, EXITCURSOR_E = 0x800A, EXITCURSOR_LEFT_HAND = 0x800B, CURSOR_INVALID = 0x800C,
EXITCURSOR_NE = 0x800D, EXITCURSOR_SE = 0x800E, EXITCURSOR_SW = 0x800F, EXITCURSOR_NW = 0x8010, EXITCURSOR_NE = 0x800D, EXITCURSOR_SE = 0x800E, EXITCURSOR_SW = 0x800F, EXITCURSOR_NW = 0x8010,
SHADECURSOR_UP = 0x8011, SHADECURSOR_DOWN = 0x8012, SHADECURSOR_HAND = 0x8013, SHADECURSOR_UP = 0x8011, SHADECURSOR_DOWN = 0x8012, SHADECURSOR_HAND = 0x8013,
R2_CURSOR_20 = 0x8014, R2_CURSOR_21 = 0x8015, R2_CURSOR_22 = 0x8016, R2_CURSOR_23 = 0x8017, R2_CURSOR_20 = 0x8014, R2_CURSOR_21 = 0x8015, R2_CURSOR_22 = 0x8016, R2_CURSOR_23 = 0x8017,

6
engines/tsage/graphics.cpp
View File

@ -266,7 +266,7 @@ void GfxSurface::updateScreen() {
continue; continue;
const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top); const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top,
r.width(), r.height()); r.width(), r.height());
} }
@ -287,7 +287,7 @@ void GfxSurface::addDirtyRect(const Rect &r) {
r2.translate(_bounds.left, _bounds.top); r2.translate(_bounds.left, _bounds.top);
// Add to the dirty rect list // Add to the dirty rect list
_dirtyRects.push_back(Rect(r2.left, r2.top, _dirtyRects.push_back(Rect(r2.left, r2.top,
MIN(r2.right + 1, SCREEN_WIDTH), MIN(r2.bottom + 1, SCREEN_HEIGHT))); MIN(r2.right + 1, SCREEN_WIDTH), MIN(r2.bottom + 1, SCREEN_HEIGHT)));
} }
} }
@ -1194,7 +1194,7 @@ void GfxDialog::setPalette() {
g_globals->_scenePalette.setPalette(g_globals->_fontColors.background, 1); g_globals->_scenePalette.setPalette(g_globals->_fontColors.background, 1);
g_globals->_scenePalette.setPalette(g_globals->_fontColors.foreground, 1); g_globals->_scenePalette.setPalette(g_globals->_fontColors.foreground, 1);
g_globals->_scenePalette.setEntry(255, 0xff, 0xff, 0xff); g_globals->_scenePalette.setEntry(255, 0xff, 0xff, 0xff);
g_globals->_scenePalette.setPalette(255, 1); g_globals->_scenePalette.setPalette(255, 1);
} else { } else {
g_globals->_scenePalette.loadPalette(0); g_globals->_scenePalette.loadPalette(0);
g_globals->_scenePalette.setPalette(0, 1); g_globals->_scenePalette.setPalette(0, 1);

8
engines/tsage/resources.cpp
View File

@ -326,7 +326,7 @@ uint32 TLib::getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum
// Load in the section index // Load in the section index
loadSection((*i).fileOffset); loadSection((*i).fileOffset);
// Scan for an entry for the given Id // Scan for an entry for the given Id
ResourceEntry *re = NULL; ResourceEntry *re = NULL;
ResourceList::iterator iter; ResourceList::iterator iter;
@ -341,7 +341,7 @@ uint32 TLib::getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum
if (!re || re->isCompressed) if (!re || re->isCompressed)
error("Invalid resource Id #%d", rlbNum); error("Invalid resource Id #%d", rlbNum);
// Return the resource entry as well as the file offset // Return the resource entry as well as the file offset
entry = *re; entry = *re;
return _sections.fileOffset + entry.fileOffset; return _sections.fileOffset + entry.fileOffset;
} }
@ -441,7 +441,7 @@ bool TLib::getMessage(int resNum, int lineNum, Common::String &result, bool supp
while (lineNum-- > 0) { while (lineNum-- > 0) {
srcP += strlen(srcP) + 1; srcP += strlen(srcP) + 1;
if (srcP >= endP) { if (srcP >= endP) {
if (suppressErrors) if (suppressErrors)
return false; return false;
@ -537,7 +537,7 @@ Common::String ResourceManager::getMessage(int resNum, int lineNum, bool suppres
* Open up the given resource file using a passed file object. If the desired entry is found * Open up the given resource file using a passed file object. If the desired entry is found
* in the index, return the index entry for it, and move the file to the start of the resource * in the index, return the index entry for it, and move the file to the start of the resource
*/ */
bool ResourceManager::scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum, bool ResourceManager::scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum,
ResourceEntry &resEntry) { ResourceEntry &resEntry) {
// Load the root section index // Load the root section index
ResourceList resList; ResourceList resList;

2
engines/tsage/ringworld2/ringworld2_dialogs.cpp
View File

@ -389,7 +389,7 @@ HelpDialog::HelpDialog() {
_msgTitle._bounds.moveTo(5, 0); _msgTitle._bounds.moveTo(5, 0);
_msgVersion.set(GAME_VERSION, 172, ALIGN_CENTER); _msgVersion.set(GAME_VERSION, 172, ALIGN_CENTER);
_msgVersion._bounds.moveTo(5, _msgTitle._bounds.bottom + 3); _msgVersion._bounds.moveTo(5, _msgTitle._bounds.bottom + 3);
addElements(&_msgTitle, &_msgVersion, NULL); addElements(&_msgTitle, &_msgVersion, NULL);
// Set buttons // Set buttons
_btnList[0].setText(F2); _btnList[0].setText(F2);

62
engines/tsage/ringworld2/ringworld2_logic.cpp
View File

@ -40,16 +40,16 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
switch (sceneNumber) { switch (sceneNumber) {
/* Scene group #0 */ /* Scene group #0 */
case 50: case 50:
// Waking up cutscene // Waking up cutscene
return new Scene50(); return new Scene50();
case 100: case 100:
// Quinn's room // Quinn's room
return new Scene100(); return new Scene100();
case 125: case 125:
// Computer console // Computer console
return new Scene125(); return new Scene125();
case 150: case 150:
// Empty Bedroom #1 // Empty Bedroom #1
return new Scene150(); return new Scene150();
case 160: case 160:
@ -166,7 +166,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
// Ice Maze: Large empty room // Ice Maze: Large empty room
return new Scene2400(); return new Scene2400();
case 2425: case 2425:
// Ice Maze: // Ice Maze:
return new Scene2425(); return new Scene2425();
case 2430: case 2430:
// Ice Maze: Bedroom // Ice Maze: Bedroom
@ -326,7 +326,7 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
int prevScene = R2_GLOBALS._sceneManager._previousScene; int prevScene = R2_GLOBALS._sceneManager._previousScene;
int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber; int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50)) if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
|| (sceneNumber == 50) || (sceneNumber == 50)
|| ((prevScene == 205) && (sceneNumber == 100)) || ((prevScene == 205) && (sceneNumber == 100))
|| ((prevScene == 180) && (sceneNumber == 100))) { || ((prevScene == 180) && (sceneNumber == 100))) {
@ -549,7 +549,7 @@ void SceneExt::scalePalette(int RFactor, int GFactor, int BFactor) {
tmp += abs(tmpPal[(3 * j) + 2] - newB); tmp += abs(tmpPal[(3 * j) + 2] - newB);
if (tmp >= varC) if (tmp >= varC)
continue; continue;
varC = tmp; varC = tmp;
varD = j; varD = j;
} }
@ -628,11 +628,11 @@ void SceneHandlerExt::setupPaletteMaps() {
diffSum += ABS(palP[pIndex2 * 3 + 1] - g); diffSum += ABS(palP[pIndex2 * 3 + 1] - g);
if (diffSum >= threshold) if (diffSum >= threshold)
continue; continue;
diffSum += ABS(palP[pIndex2 * 3 + 2] - b); diffSum += ABS(palP[pIndex2 * 3 + 2] - b);
if (diffSum >= threshold) if (diffSum >= threshold)
continue; continue;
threshold = diffSum; threshold = diffSum;
foundIndex = pIndex2; foundIndex = pIndex2;
} }
@ -1257,12 +1257,12 @@ void SceneAreaObject::setDetails(int visage, int strip, int frameNumber, const C
_cursorNum = CURSOR_INVALID; _cursorNum = CURSOR_INVALID;
Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene; Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
scene->_sceneAreas.push_front(this); scene->_sceneAreas.push_front(this);
_insetCount = ++R2_GLOBALS._insetUp; _insetCount = ++R2_GLOBALS._insetUp;
} }
void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) { void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum, ((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum,
2, (SceneItem *)NULL); 2, (SceneItem *)NULL);
} }
@ -1306,7 +1306,7 @@ void UnkObject1200::sub51AE9(int arg1) {
int UnkObject1200::sub51AF8(Common::Point pt) { int UnkObject1200::sub51AF8(Common::Point pt) {
if (!_rect1.contains(pt)) if (!_rect1.contains(pt))
return -1; return -1;
int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A; int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A;
int tmp2 = (pt.y - _rect1.top + _field30) / _field2C; int tmp2 = (pt.y - _rect1.top + _field30) / _field2C;
@ -1358,7 +1358,7 @@ void UnkObject1200::sub9EDE8(Rect rect) {
int UnkObject1200::sub9EE22(int &arg1, int &arg2) { int UnkObject1200::sub9EE22(int &arg1, int &arg2) {
arg1 /= _field2A; arg1 /= _field2A;
arg2 /= _field2C; arg2 /= _field2C;
if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) { if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) {
return _field16[(((_field26 * arg2) + arg1) * 2)]; return _field16[(((_field26 * arg2) + arg1) * 2)];
} }
@ -1368,13 +1368,13 @@ int UnkObject1200::sub9EE22(int &arg1, int &arg2) {
void Scene1200::sub9DAD6(int indx) { void Scene1200::sub9DAD6(int indx) {
_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4); _object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
switch (indx) { switch (indx) {
case 0: case 0:
if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36)) if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36))
&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) && ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4))
|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) || ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2))
|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) || ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1))
|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) ) || ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) )
) { ) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -1415,10 +1415,10 @@ void Scene1200::sub9DAD6(int indx) {
} }
break; break;
case 1: case 1:
if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36)) if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36))
&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) && ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4))
|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) || ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2))
|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) || ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1))
|| ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) ) || ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) )
) { ) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -1459,8 +1459,8 @@ void Scene1200::sub9DAD6(int indx) {
} }
break; break;
case 2: case 2:
if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36)) if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36))
&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3)) && ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3))
|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) ) || ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) )
) { ) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -1501,8 +1501,8 @@ void Scene1200::sub9DAD6(int indx) {
} }
break; break;
case 3: case 3:
if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36)) if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36))
&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3)) && ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3))
|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) ) || ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) )
) { ) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -1574,10 +1574,10 @@ void AnimationPlayerSubData::load(Common::File &f) {
AnimationPlayer::AnimationPlayer(): EventHandler() { AnimationPlayer::AnimationPlayer(): EventHandler() {
_endAction = NULL; _endAction = NULL;
_fieldA = NULL; _fieldA = NULL;
_field16 = NULL; _field16 = NULL;
_screenBounds = R2_GLOBALS._gfxManagerInstance._bounds; _screenBounds = R2_GLOBALS._gfxManagerInstance._bounds;
_rect1 = R2_GLOBALS._gfxManagerInstance._bounds; _rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
_field3C = 0; _field3C = 0;
@ -1608,7 +1608,7 @@ void AnimationPlayer::process(Event &event) {
if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) && if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
(_field3A)) { (_field3A)) {
_field90C = _subData._field6; _field90C = _subData._field6;
} }
} }
void AnimationPlayer::dispatch() { void AnimationPlayer::dispatch() {
@ -1643,7 +1643,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
// Set the end action // Set the end action
_endAction = endAction; _endAction = endAction;
// Load the sub data block // Load the sub data block
_subData.load(_resourceFile); _subData.load(_resourceFile);
@ -1659,7 +1659,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
int v = (_subData._field12 + 2) * _subData._field14 * _subData._fieldC; int v = (_subData._field12 + 2) * _subData._field14 * _subData._fieldC;
_field900 = (_subData._field16 / _subData._fieldC) + v + 96; _field900 = (_subData._field16 / _subData._fieldC) + v + 96;
} }
_animData = _fieldA = new byte[_field900]; _animData = _fieldA = new byte[_field900];
if (_subData._fieldC <= 1) { if (_subData._fieldC <= 1) {

202
engines/tsage/ringworld2/ringworld2_scenes0.cpp
View File

@ -125,17 +125,17 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL); scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
} }
scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3, scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3,
&scene->_stasisNegator, &R2_GLOBALS._player, NULL); &scene->_stasisNegator, &R2_GLOBALS._player, NULL);
} else { } else {
scene->_sceneMode = 109; scene->_sceneMode = 109;
scene->setAction(&scene->_sequenceManager2, scene, 109, this, &scene->_object3, scene->setAction(&scene->_sequenceManager2, scene, 109, this, &scene->_object3,
&scene->_stasisNegator, &R2_GLOBALS._player, NULL); &scene->_stasisNegator, &R2_GLOBALS._player, NULL);
} }
return true; return true;
case CURSOR_TALK: case CURSOR_TALK:
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
if (_strip == 2) { if (_strip == 2) {
SceneItem::display2(100, 18); SceneItem::display2(100, 18);
scene->_sceneMode = 102; scene->_sceneMode = 102;
@ -149,12 +149,12 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL); scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
} }
scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3, scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3,
&scene->_stasisNegator, NULL); &scene->_stasisNegator, NULL);
} else { } else {
SceneItem::display2(100, 19); SceneItem::display2(100, 19);
scene->_sceneMode = 103; scene->_sceneMode = 103;
scene->setAction(&scene->_sequenceManager2, scene, 103, this, &scene->_object3, scene->setAction(&scene->_sequenceManager2, scene, 103, this, &scene->_object3,
&scene->_stasisNegator, NULL); &scene->_stasisNegator, NULL);
} }
return true; return true;
@ -264,7 +264,7 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
_bedLights2.setup(100, 3, 1); _bedLights2.setup(100, 3, 1);
_bedLights2.setPosition(Common::Point(89, 147)); _bedLights2.setPosition(Common::Point(89, 147));
_bedLights2.fixPriority(250); _bedLights2.fixPriority(250);
_bedLights2.animate(ANIM_MODE_7, 0, NULL); _bedLights2.animate(ANIM_MODE_7, 0, NULL);
_bedLights2._numFrames = 3; _bedLights2._numFrames = 3;
_wardrobe.postInit(); _wardrobe.postInit();
@ -289,7 +289,7 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.setVisage(10); R2_GLOBALS._player.setVisage(10);
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 100, 0, 1, -1, 1, NULL); _background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 100, 0, 1, -1, 1, NULL);
switch (R2_GLOBALS._sceneManager._previousScene) { switch (R2_GLOBALS._sceneManager._previousScene) {
@ -330,7 +330,7 @@ void Scene100::signal() {
case 109: case 109:
_table.setStrip(2); _table.setStrip(2);
_table.setFrame(3); _table.setFrame(3);
_object3.remove(); _object3.remove();
_stasisNegator.remove(); _stasisNegator.remove();
R2_GLOBALS._player.enableControl(); R2_GLOBALS._player.enableControl();
@ -413,7 +413,7 @@ Scene125::Icon::Icon(): SceneActor() {
void Scene125::Icon::postInit(SceneObjectList *OwnerList) { void Scene125::Icon::postInit(SceneObjectList *OwnerList) {
SceneObject::postInit(); SceneObject::postInit();
_object1.postInit(); _object1.postInit();
_object1.fixPriority(255); _object1.fixPriority(255);
_object1.hide(); _object1.hide();
@ -621,7 +621,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
loadScene(160); loadScene(160);
_palette.loadPalette(0); _palette.loadPalette(0);
if (R2_GLOBALS._sceneManager._previousScene != 125) if (R2_GLOBALS._sceneManager._previousScene != 125)
// Save the prior scene to return to when the console is turned off // Save the prior scene to return to when the console is turned off
R2_GLOBALS._player._oldCharacterScene[1] = R2_GLOBALS._sceneManager._previousScene; R2_GLOBALS._player._oldCharacterScene[1] = R2_GLOBALS._sceneManager._previousScene;
@ -638,7 +638,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
_object6.postInit(); _object6.postInit();
_object6.setup(162, 1, 1); _object6.setup(162, 1, 1);
_object6.setPosition(Common::Point(214, 168)); _object6.setPosition(Common::Point(214, 168));
_item4.setDetails(Rect(27, 145, 81, 159), 126, 9, -1, -1, 1, NULL); _item4.setDetails(Rect(27, 145, 81, 159), 126, 9, -1, -1, 1, NULL);
_item3.setDetails(Rect(144, 119, 286, 167), 126, 6, 7, 8, 1, NULL); _item3.setDetails(Rect(144, 119, 286, 167), 126, 6, 7, 8, 1, NULL);
_item2.setDetails(1, 126, 3, 4, 5); _item2.setDetails(1, 126, 3, 4, 5);
@ -669,7 +669,7 @@ void Scene125::signal() {
_icon1._object2.postInit(); _icon1._object2.postInit();
_icon1._object2.setup(160, 7, 1); _icon1._object2.setup(160, 7, 1);
_icon1._object2.setPosition(Common::Point(106, 41)); _icon1._object2.setPosition(Common::Point(106, 41));
_icon2.setup(160, 1, 1); _icon2.setup(160, 1, 1);
_icon2.setPosition(Common::Point(80, 32)); _icon2.setPosition(Common::Point(80, 32));
_icon2._object2.postInit(); _icon2._object2.postInit();
@ -766,7 +766,7 @@ void Scene125::signal() {
case 11: case 11:
R2_GLOBALS._player.enableControl(); R2_GLOBALS._player.enableControl();
R2_GLOBALS._player._canWalk = false; R2_GLOBALS._player._canWalk = false;
if ((_consoleMode >= 27) && (_consoleMode <= 30)) { if ((_consoleMode >= 27) && (_consoleMode <= 30)) {
consoleAction(11); consoleAction(11);
} }
@ -915,7 +915,7 @@ void Scene125::consoleAction(int id) {
_icon2.hideIcon(); _icon2.hideIcon();
_icon3.hideIcon(); _icon3.hideIcon();
_icon5.setIcon(24); _icon5.setIcon(24);
_icon4.setPosition(Common::Point(52, 107)); _icon4.setPosition(Common::Point(52, 107));
_icon4._sceneRegionId = 9; _icon4._sceneRegionId = 9;
_icon4.setIcon(25); _icon4.setIcon(25);
@ -923,7 +923,7 @@ void Scene125::consoleAction(int id) {
_icon6.setIcon(26); _icon6.setIcon(26);
_sceneMode = 10; _sceneMode = 10;
_palette.loadPalette(161); _palette.loadPalette(161);
R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this); R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
break; break;
@ -958,7 +958,7 @@ void Scene125::consoleAction(int id) {
_icon2.hideIcon(); _icon2.hideIcon();
_icon3.hideIcon(); _icon3.hideIcon();
_icon5.setIcon(24); _icon5.setIcon(24);
_icon4.setPosition(Common::Point(52, 107)); _icon4.setPosition(Common::Point(52, 107));
_icon4._sceneRegionId = 9; _icon4._sceneRegionId = 9;
_icon4.setIcon(25); _icon4.setIcon(25);
@ -966,7 +966,7 @@ void Scene125::consoleAction(int id) {
_icon6.setIcon(26); _icon6.setIcon(26);
_sceneMode = 10; _sceneMode = 10;
_palette.loadPalette(161); _palette.loadPalette(161);
R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this); R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
} }
@ -1089,7 +1089,7 @@ void Scene125::consoleAction(int id) {
_icon3.hideIcon(); _icon3.hideIcon();
_icon4.hideIcon(); _icon4.hideIcon();
_icon5.setIcon(24); _icon5.setIcon(24);
_icon4.setPosition(Common::Point(52, 107)); _icon4.setPosition(Common::Point(52, 107));
_icon4._sceneRegionId = 9; _icon4._sceneRegionId = 9;
_icon4.setIcon(25); _icon4.setIcon(25);
@ -1097,7 +1097,7 @@ void Scene125::consoleAction(int id) {
_icon6.setIcon(26); _icon6.setIcon(26);
_sceneMode = 10; _sceneMode = 10;
_palette.loadPalette(161); _palette.loadPalette(161);
R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this); R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
break; break;
@ -1134,7 +1134,7 @@ void Scene125::consoleAction(int id) {
*/ */
void Scene125::setDetails(int resNum, int lineNum) { void Scene125::setDetails(int resNum, int lineNum) {
stop(); stop();
Common::String msg = g_resourceManager->getMessage(resNum, lineNum, true); Common::String msg = g_resourceManager->getMessage(resNum, lineNum, true);
if (!msg.empty()) { if (!msg.empty()) {
@ -1243,7 +1243,7 @@ void Scene150::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.setVisage(10); R2_GLOBALS._player.setVisage(10);
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 150, 0, 1, -1, 1, NULL); _background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 150, 0, 1, -1, 1, NULL);
_sceneMode = 100; _sceneMode = 100;
@ -1420,7 +1420,7 @@ void Scene160::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player._uiEnabled = false; R2_GLOBALS._player._uiEnabled = false;
R2_GLOBALS._player.enableControl(); R2_GLOBALS._player.enableControl();
R2_GLOBALS._player._canWalk = false; R2_GLOBALS._player._canWalk = false;
R2_GLOBALS._uiElements.hide(); R2_GLOBALS._uiElements.hide();
R2_GLOBALS._interfaceY = SCREEN_HEIGHT; R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
@ -1664,7 +1664,7 @@ void Scene180::signal() {
case 15: case 15:
setAction(&_sequenceManager, this, 4002, &_object4, &_object5, NULL); setAction(&_sequenceManager, this, 4002, &_object4, &_object5, NULL);
break; break;
case 17: case 17:
setAction(&_sequenceManager, this, 4003, &_object4, &_object5, NULL); setAction(&_sequenceManager, this, 4003, &_object4, &_object5, NULL);
break; break;
@ -1730,7 +1730,7 @@ void Scene180::signal() {
case 32: case 32:
_field412 = 1; _field412 = 1;
_object2.postInit(); _object2.postInit();
_object2.setPosition(Common::Point(161, 97)); _object2.setPosition(Common::Point(161, 97));
_object2.hide(); _object2.hide();
@ -1790,7 +1790,7 @@ void Scene180::signal() {
_object4.remove(); _object4.remove();
_object5.setAction(NULL); _object5.setAction(NULL);
_object5.remove(); _object5.remove();
R2_GLOBALS._sound2.fadeOut2(NULL); R2_GLOBALS._sound2.fadeOut2(NULL);
R2_GLOBALS._sound1.fadeOut2(NULL); R2_GLOBALS._sound1.fadeOut2(NULL);
break; break;
@ -2389,7 +2389,7 @@ void Scene205::dispatch() {
void Scene205::setup() { void Scene205::setup() {
const Common::Point pointList1[3] = { Common::Point(2, 50), Common::Point(100, 28), Common::Point(53, 15) }; const Common::Point pointList1[3] = { Common::Point(2, 50), Common::Point(100, 28), Common::Point(53, 15) };
const Common::Point pointList2[3] = { Common::Point(289, 192), Common::Point(125, 60), Common::Point(130, 40) }; const Common::Point pointList2[3] = { Common::Point(289, 192), Common::Point(125, 60), Common::Point(130, 40) };
const Common::Point pointList3[4] = { const Common::Point pointList3[4] = {
Common::Point(140, 149), Common::Point(91, 166), Common::Point(299, 46), Common::Point(314, 10) Common::Point(140, 149), Common::Point(91, 166), Common::Point(299, 46), Common::Point(314, 10)
}; };
@ -2445,13 +2445,13 @@ void Scene205::setup() {
/** /**
* Handles moving a group of stars in the scene background * Handles moving a group of stars in the scene background
*/ */
void Scene205::processList(Object **ObjList, int count, const Common::Rect &bounds, void Scene205::processList(Object **ObjList, int count, const Common::Rect &bounds,
int xMultiply, int yMultiply, int xCenter, int yCenter) { int xMultiply, int yMultiply, int xCenter, int yCenter) {
for (int idx = 0; idx < count; ++idx) { for (int idx = 0; idx < count; ++idx) {
Object *obj = ObjList[idx]; Object *obj = ObjList[idx];
Common::Point pt(obj->_position.x - xCenter, obj->_position.y - yCenter); Common::Point pt(obj->_position.x - xCenter, obj->_position.y - yCenter);
if ((obj->_position.x <= 319) && (obj->_position.x >= 0) && if ((obj->_position.x <= 319) && (obj->_position.x >= 0) &&
(obj->_position.y <= 199) && (obj->_position.y >= 0)) { (obj->_position.y <= 199) && (obj->_position.y >= 0)) {
if (!pt.x && !pt.y) { if (!pt.x && !pt.y) {
pt.x = pt.y = 1; pt.x = pt.y = 1;
@ -2484,7 +2484,7 @@ void Scene205::handleText() {
GfxFont font; GfxFont font;
font.setFontNumber(4); font.setFontNumber(4);
int width = font.getStringWidth(_message.c_str()); int width = font.getStringWidth(_message.c_str());
_textList[_textIndex].setPosition(Common::Point(160 - (width / 2), _yp)); _textList[_textIndex].setPosition(Common::Point(160 - (width / 2), _yp));
} }
@ -2681,13 +2681,13 @@ void Scene250::signal() {
_field412 += 12; _field412 += 12;
R2_GLOBALS._player.setPosition(Common::Point(261, 185)); R2_GLOBALS._player.setPosition(Common::Point(261, 185));
ADD_MOVER(R2_GLOBALS._player, 261, 15); ADD_MOVER(R2_GLOBALS._player, 261, 15);
if ((_field414 - 12) == _field412) if ((_field414 - 12) == _field412)
_sceneMode = 4; _sceneMode = 4;
break; break;
case 4: case 4:
_sound1.play(21); _sound1.play(21);
_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y + 12)); _currentFloor.setPosition(Common::Point(111, _currentFloor._position.y + 12));
R2_GLOBALS._player.setPosition(Common::Point(261, 185)); R2_GLOBALS._player.setPosition(Common::Point(261, 185));
ADD_MOVER(R2_GLOBALS._player, 261, 15); ADD_MOVER(R2_GLOBALS._player, 261, 15);
@ -2837,7 +2837,7 @@ void Scene300::Action2::signal() {
case 2: case 2:
if (!R2_GLOBALS._playStream.isPlaying()) if (!R2_GLOBALS._playStream.isPlaying())
_actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1); _actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1);
setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119)); setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119));
break; break;
default: default:
@ -2860,7 +2860,7 @@ void Scene300::Action3::signal() {
case 2: case 2:
if (!R2_GLOBALS._playStream.isPlaying()) if (!R2_GLOBALS._playStream.isPlaying())
_actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1); _actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1);
setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119)); setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119));
break; break;
default: default:
@ -2922,7 +2922,7 @@ bool Scene300::MirandaWorkstation::startAction(CursorType action, Event &event)
if (R2_GLOBALS._player._characterIndex != 3) if (R2_GLOBALS._player._characterIndex != 3)
SceneItem::display2(300, 49); SceneItem::display2(300, 49);
else else
R2_GLOBALS._sceneManager.changeScene(325); R2_GLOBALS._sceneManager.changeScene(325);
return true; return true;
case CURSOR_LOOK: case CURSOR_LOOK:
@ -2952,7 +2952,7 @@ bool Scene300::SeekerWorkstation::startAction(CursorType action, Event &event) {
if (R2_GLOBALS._player._characterIndex != 2) if (R2_GLOBALS._player._characterIndex != 2)
SceneItem::display2(300, 48); SceneItem::display2(300, 48);
else else
R2_GLOBALS._sceneManager.changeScene(325); R2_GLOBALS._sceneManager.changeScene(325);
return true; return true;
default: default:
@ -3107,7 +3107,7 @@ bool Scene300::Seeker::startAction(CursorType action, Event &event) {
scene->_sceneMode = 310; scene->_sceneMode = 310;
scene->setAction(&scene->_sequenceManager1, scene, 310, &R2_GLOBALS._player, NULL); scene->setAction(&scene->_sequenceManager1, scene, 310, &R2_GLOBALS._player, NULL);
return true; return true;
default: default:
break; break;
} }
@ -3153,7 +3153,7 @@ bool Scene300::Doorway::startAction(CursorType action, Event &event) {
Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene; Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
if (action == CURSOR_USE) { if (action == CURSOR_USE) {
if ((R2_GLOBALS._player._characterIndex == R2_QUINN) && if ((R2_GLOBALS._player._characterIndex == R2_QUINN) &&
(!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)) { (!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 301; scene->_sceneMode = 301;
@ -3161,7 +3161,7 @@ bool Scene300::Doorway::startAction(CursorType action, Event &event) {
} else { } else {
SceneItem::display2(300, 45); SceneItem::display2(300, 45);
} }
return true; return true;
} else { } else {
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
@ -3373,7 +3373,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.setup(302, 3, 1); R2_GLOBALS._player.setup(302, 3, 1);
R2_GLOBALS._player.setPosition(Common::Point(271, 150)); R2_GLOBALS._player.setPosition(Common::Point(271, 150));
R2_GLOBALS._player.setAction(&_action1); R2_GLOBALS._player.setAction(&_action1);
if (R2_GLOBALS.getFlag(55)) { if (R2_GLOBALS.getFlag(55)) {
if (R2_GLOBALS.getFlag(57)) { if (R2_GLOBALS.getFlag(57)) {
R2_GLOBALS.clearFlag(60); R2_GLOBALS.clearFlag(60);
@ -3689,7 +3689,7 @@ void Scene300::signal309() {
if (R2_GLOBALS.getFlag(39)) if (R2_GLOBALS.getFlag(39))
R2_GLOBALS._stripManager_lookupList[1] = 2; R2_GLOBALS._stripManager_lookupList[1] = 2;
if (R2_GLOBALS.getFlag(5)) if (R2_GLOBALS.getFlag(5))
R2_GLOBALS._stripManager_lookupList[1] = 3; R2_GLOBALS._stripManager_lookupList[1] = 3;
@ -3728,7 +3728,7 @@ Scene325::Icon::Icon(): SceneActor() {
void Scene325::Icon::postInit(SceneObjectList *OwnerList) { void Scene325::Icon::postInit(SceneObjectList *OwnerList) {
SceneObject::postInit(); SceneObject::postInit();
_object1.postInit(); _object1.postInit();
_object1.fixPriority(21); _object1.fixPriority(21);
_object1.hide(); _object1.hide();
@ -3895,7 +3895,7 @@ Scene325::Scene325(): SceneExt() {
_field416 = _field418 = 0; _field416 = _field418 = 0;
_field41A = _field41C = _field41E = _field420 = 0; _field41A = _field41C = _field41E = _field420 = 0;
_soundCount = _soundIndex = 0; _soundCount = _soundIndex = 0;
for (int idx = 0; idx < 10; ++idx) for (int idx = 0; idx < 10; ++idx)
_soundQueue[idx] = 0; _soundQueue[idx] = 0;
} }
@ -3907,7 +3907,7 @@ void Scene325::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS.clearFlag(50); R2_GLOBALS.clearFlag(50);
_stripManager.addSpeaker(&_quinnSpeaker); _stripManager.addSpeaker(&_quinnSpeaker);
_palette.loadPalette(0); _palette.loadPalette(0);
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
R2_GLOBALS._player.hide(); R2_GLOBALS._player.hide();
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -3917,7 +3917,7 @@ void Scene325::postInit(SceneObjectList *OwnerList) {
_sceneMode = 1; _sceneMode = 1;
signal(); signal();
} }
void Scene325::synchronize(Serializer &s) { void Scene325::synchronize(Serializer &s) {
SceneExt::synchronize(s); SceneExt::synchronize(s);
@ -3953,7 +3953,7 @@ void Scene325::signal() {
_icon4.postInit(); _icon4.postInit();
_icon4._sceneRegionId = 5; _icon4._sceneRegionId = 5;
setAction(&_sequenceManager1, this, 127, &_icon1, &_icon2, &_icon3, &_icon4, setAction(&_sequenceManager1, this, 127, &_icon1, &_icon2, &_icon3, &_icon4,
&R2_GLOBALS._player, NULL); &R2_GLOBALS._player, NULL);
_sceneMode = 2; _sceneMode = 2;
break; break;
@ -3969,7 +3969,7 @@ void Scene325::signal() {
_icon2._object2.postInit(); _icon2._object2.postInit();
_icon2._object2.setup(160, 7, 2); _icon2._object2.setup(160, 7, 2);
_icon2._object2.setPosition(Common::Point(106, 56)); _icon2._object2.setPosition(Common::Point(106, 56));
_icon3.setup(160, 1, 1); _icon3.setup(160, 1, 1);
_icon3.setPosition(Common::Point(65, 47)); _icon3.setPosition(Common::Point(65, 47));
_icon3._object2.postInit(); _icon3._object2.postInit();
@ -4008,7 +4008,7 @@ void Scene325::signal() {
_object3.postInit(); _object3.postInit();
if (R2_GLOBALS.getFlag(13)) { if (R2_GLOBALS.getFlag(13)) {
_object4.postInit(); _object4.postInit();
setAction(&_sequenceManager1, this, 130, &R2_GLOBALS._player, &_object1, setAction(&_sequenceManager1, this, 130, &R2_GLOBALS._player, &_object1,
&_object2, &_object3, &_object4, NULL); &_object2, &_object3, &_object4, NULL);
} else { } else {
setAction(&_sequenceManager1, this, 129, &R2_GLOBALS._player, &_object1, setAction(&_sequenceManager1, this, 129, &R2_GLOBALS._player, &_object1,
@ -4042,12 +4042,12 @@ void Scene325::signal() {
_object13.setup(326, 4, 2); _object13.setup(326, 4, 2);
_object13.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR))); _object13.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR)));
_object13.fixPriority(21); _object13.fixPriority(21);
_object10.postInit(); _object10.postInit();
_object10.setup(326, 1, 1); _object10.setup(326, 1, 1);
_object10.setPosition(Common::Point(210, 20)); _object10.setPosition(Common::Point(210, 20));
_object10.fixPriority(10); _object10.fixPriority(10);
_object1.postInit(); _object1.postInit();
_object1.setup(326, 1, 1); _object1.setup(326, 1, 1);
_object1.setPosition(Common::Point(210, 32)); _object1.setPosition(Common::Point(210, 32));
@ -4072,7 +4072,7 @@ void Scene325::signal() {
_object5.setup(326, 1, 1); _object5.setup(326, 1, 1);
_object5.setPosition(Common::Point(210, 80)); _object5.setPosition(Common::Point(210, 80));
_object5.fixPriority(10); _object5.fixPriority(10);
_object6.postInit(); _object6.postInit();
_object6.setup(326, 1, 1); _object6.setup(326, 1, 1);
_object6.setPosition(Common::Point(210, 92)); _object6.setPosition(Common::Point(210, 92));
@ -4450,7 +4450,7 @@ void Scene325::dispatch() {
for (int idx = 0; idx < 4; ++idx) for (int idx = 0; idx < 4; ++idx)
_objList[idx].remove(); _objList[idx].remove();
if (flag) { if (flag) {
int v = _field420 - 758; int v = _field420 - 758;
_object10.setFrame((v++ <= 0) ? 1 : v); _object10.setFrame((v++ <= 0) ? 1 : v);
@ -4522,7 +4522,7 @@ void Scene325::setMessage(int resNum, int lineNum) {
_text1.setPosition(Common::Point(49, 19)); _text1.setPosition(Common::Point(49, 19));
R2_GLOBALS._sceneObjects->draw(); R2_GLOBALS._sceneObjects->draw();
if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) { if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) {
_sceneMode = 15; _sceneMode = 15;
R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this); R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this);
@ -4804,7 +4804,7 @@ bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) { if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
if (R2_GLOBALS.getFlag(26)) { if (R2_GLOBALS.getFlag(26)) {
scene->_stripNumber = 1104; scene->_stripNumber = 1104;
scene->_sceneMode = 524; scene->_sceneMode = 524;
@ -4818,7 +4818,7 @@ bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
return SceneHotspot::startAction(action, event); return SceneHotspot::startAction(action, event);
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
bool Scene500::Object2::startAction(CursorType action, Event &event) { bool Scene500::Object2::startAction(CursorType action, Event &event) {
@ -4910,7 +4910,7 @@ bool Scene500::Doorway::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL); scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
} else { } else {
scene->_sceneMode = 500; scene->_sceneMode = 500;
scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL); scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL);
} }
return true; return true;
@ -4931,17 +4931,17 @@ bool Scene500::OxygenTanks::startAction(CursorType action, Event &event) {
if (R2_GLOBALS._player._characterIndex != R2_QUINN) { if (R2_GLOBALS._player._characterIndex != R2_QUINN) {
SceneItem::display2(500, 52); SceneItem::display2(500, 52);
return true; return true;
} else if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 1) && } else if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 1) &&
(R2_GLOBALS._player._characterIndex != R2_SEEKER) && !R2_GLOBALS.getFlag(28)) { (R2_GLOBALS._player._characterIndex != R2_SEEKER) && !R2_GLOBALS.getFlag(28)) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
if (_position.y == 120) { if (_position.y == 120) {
scene->_sceneMode = 513; scene->_sceneMode = 513;
scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
&scene->_tanks1, NULL); &scene->_tanks1, NULL);
} else { } else {
scene->_sceneMode = 514; scene->_sceneMode = 514;
scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
&scene->_tanks2, NULL); &scene->_tanks2, NULL);
} }
return true; return true;
@ -4961,7 +4961,7 @@ bool Scene500::AirLock::startAction(CursorType action, Event &event) {
if ((action == CURSOR_USE) && R2_GLOBALS.getFlag(26)) { if ((action == CURSOR_USE) && R2_GLOBALS.getFlag(26)) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = (R2_GLOBALS._player._characterIndex == R2_QUINN) ? 521 : 522; scene->_sceneMode = (R2_GLOBALS._player._characterIndex == R2_QUINN) ? 521 : 522;
scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
&scene->_object2, &scene->_airLock, NULL); &scene->_object2, &scene->_airLock, NULL);
return true; return true;
} else { } else {
@ -5144,7 +5144,7 @@ void Scene500::postInit(SceneObjectList *OwnerList) {
_object1.setup(502, 1, 1); _object1.setup(502, 1, 1);
_object1.setPosition(Common::Point(258, 99)); _object1.setPosition(Common::Point(258, 99));
_object1.fixPriority(50); _object1.fixPriority(50);
_object8.postInit(); _object8.postInit();
_object8.setPosition(Common::Point(250, 111)); _object8.setPosition(Common::Point(250, 111));
@ -5322,16 +5322,16 @@ void Scene525::postInit(SceneObjectList *OwnerList) {
loadScene(525); loadScene(525);
R2_GLOBALS._uiElements._active = false; R2_GLOBALS._uiElements._active = false;
SceneExt::postInit(); SceneExt::postInit();
R2_GLOBALS._sound1.play(105); R2_GLOBALS._sound1.play(105);
_actor1.postInit(); _actor1.postInit();
_actor1._effect = 1; _actor1._effect = 1;
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
setAction(&_sequenceManager, this, 525, &R2_GLOBALS._player, &_actor1, NULL); setAction(&_sequenceManager, this, 525, &R2_GLOBALS._player, &_actor1, NULL);
} }
@ -5340,7 +5340,7 @@ void Scene525::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 600 - * Scene 600 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene600::Scene600() { Scene600::Scene600() {
@ -5368,28 +5368,28 @@ bool Scene600::Item1::startAction(CursorType action, Event &event) {
bool Scene600::Item4::startAction(CursorType action, Event &event) { bool Scene600::Item4::startAction(CursorType action, Event &event) {
if ((action != R2_NEGATOR_GUN) || (!R2_GLOBALS.getFlag(1))) if ((action != R2_NEGATOR_GUN) || (!R2_GLOBALS.getFlag(1)))
return SceneHotspot::startAction(action, event); return SceneHotspot::startAction(action, event);
if ((R2_GLOBALS.getFlag(5)) && (!R2_GLOBALS.getFlag(8))) { if ((R2_GLOBALS.getFlag(5)) && (!R2_GLOBALS.getFlag(8))) {
SceneItem::display(600, 32, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999); SceneItem::display(600, 32, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
return true; return true;
} }
if (R2_GLOBALS.getFlag(5)) { if (R2_GLOBALS.getFlag(5)) {
SceneItem::display(600, 30, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999); SceneItem::display(600, 30, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
return true; return true;
} }
if ((!R2_GLOBALS.getFlag(8)) || (R2_GLOBALS.getFlag(9))) if ((!R2_GLOBALS.getFlag(8)) || (R2_GLOBALS.getFlag(9)))
return SceneHotspot::startAction(action, event); return SceneHotspot::startAction(action, event);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene; Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0); scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0);
scene->_actor3.postInit(); scene->_actor3.postInit();
scene->_actor2.postInit(); scene->_actor2.postInit();
scene->_sceneMode = 612; scene->_sceneMode = 612;
setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, &R2_GLOBALS._player, NULL); setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, &R2_GLOBALS._player, NULL);
return true; return true;
@ -5405,7 +5405,7 @@ bool Scene600::Actor4::startAction(CursorType action, Event &event) {
if ((action >= CURSOR_WALK) && (action < R2CURSORS_START)) if ((action >= CURSOR_WALK) && (action < R2CURSORS_START))
// Only action cursors // Only action cursors
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
return false; return false;
} }
@ -5417,10 +5417,10 @@ void Scene600::Actor4::draw() {
bool Scene600::Actor5::startAction(CursorType action, Event &event) { bool Scene600::Actor5::startAction(CursorType action, Event &event) {
if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) if ((action < CURSOR_WALK) && (action >= R2CURSORS_START))
return false; return false;
if (action != CURSOR_USE) if (action != CURSOR_USE)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene; Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
if ((R2_INVENTORY.getObjectScene(R2_CLAMP) == 600) && (!R2_GLOBALS.getFlag(6))) { if ((R2_INVENTORY.getObjectScene(R2_CLAMP) == 600) && (!R2_GLOBALS.getFlag(6))) {
@ -5431,17 +5431,17 @@ bool Scene600::Actor5::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager1, scene, 609, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, &scene->_actor1, NULL); scene->setAction(&scene->_sequenceManager1, scene, 609, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, &scene->_actor1, NULL);
return true; return true;
} }
if (_frame != 1) if (_frame != 1)
return false; return false;
if (!R2_GLOBALS.getFlag(6)) { if (!R2_GLOBALS.getFlag(6)) {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 616; scene->_sceneMode = 616;
scene->setAction(&scene->_sequenceManager1, scene, 616, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, NULL); scene->setAction(&scene->_sequenceManager1, scene, 616, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, NULL);
return true; return true;
} }
if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 600)) if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 600))
SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999); SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
else { else {
@ -5860,10 +5860,10 @@ bool Scene700::Actor2::startAction(CursorType action, Event &event) {
if (action != CURSOR_USE) if (action != CURSOR_USE)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
if (R2_GLOBALS._player._position.y <= 100) if (R2_GLOBALS._player._position.y <= 100)
return false; return false;
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 701; scene->_sceneMode = 701;
scene->setAction(&scene->_sequenceManager, scene, 701, &R2_GLOBALS._player, this, NULL); scene->setAction(&scene->_sequenceManager, scene, 701, &R2_GLOBALS._player, this, NULL);
@ -5876,10 +5876,10 @@ bool Scene700::Actor3::startAction(CursorType action, Event &event) {
if (action != CURSOR_USE) if (action != CURSOR_USE)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
if (R2_GLOBALS._player._position.y <= 100) if (R2_GLOBALS._player._position.y <= 100)
return false; return false;
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 702; scene->_sceneMode = 702;
scene->setAction(&scene->_sequenceManager, scene, 702, &R2_GLOBALS._player, this, NULL); scene->setAction(&scene->_sequenceManager, scene, 702, &R2_GLOBALS._player, this, NULL);
@ -5892,10 +5892,10 @@ bool Scene700::Actor4::startAction(CursorType action, Event &event) {
if (action != CURSOR_USE) if (action != CURSOR_USE)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
if (R2_GLOBALS._player._position.y <= 100) if (R2_GLOBALS._player._position.y <= 100)
return false; return false;
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 704; scene->_sceneMode = 704;
scene->setAction(&scene->_sequenceManager, scene, 704, &R2_GLOBALS._player, this, NULL); scene->setAction(&scene->_sequenceManager, scene, 704, &R2_GLOBALS._player, this, NULL);
@ -5951,7 +5951,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
break; break;
} }
return true; return true;
} }
@ -5960,7 +5960,7 @@ bool Scene700::Actor6::startAction(CursorType action, Event &event) {
if ((action != CURSOR_USE) || (R2_GLOBALS._player._position.y >= 100)) if ((action != CURSOR_USE) || (R2_GLOBALS._player._position.y >= 100))
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 1; scene->_sceneMode = 1;
Common::Point pt(_position.x, 69); Common::Point pt(_position.x, 69);
@ -5973,7 +5973,7 @@ bool Scene700::Actor6::startAction(CursorType action, Event &event) {
void Scene700::postInit(SceneObjectList *OwnerList) { void Scene700::postInit(SceneObjectList *OwnerList) {
if (R2_GLOBALS._sceneManager._previousScene == 900) if (R2_GLOBALS._sceneManager._previousScene == 900)
g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0)); g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
loadScene(700); loadScene(700);
R2_GLOBALS._v558B6.set(60, 0, 260, 200); R2_GLOBALS._v558B6.set(60, 0, 260, 200);
SceneExt::postInit(); SceneExt::postInit();
@ -5993,7 +5993,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
_actor3.setPosition(Common::Point(217, 120)); _actor3.setPosition(Common::Point(217, 120));
_actor3.fixPriority(10); _actor3.fixPriority(10);
_actor3.setDetails(700, 15, -1, -1, 1, (SceneItem *) NULL); _actor3.setDetails(700, 15, -1, -1, 1, (SceneItem *) NULL);
_actor1.postInit(); _actor1.postInit();
_actor1.setup(700, 4, 1); _actor1.setup(700, 4, 1);
_actor1.setPosition(Common::Point(355 - ((R2_GLOBALS._v565E3 * 8) / 5), ((R2_GLOBALS._v565E1 + 20 ) / 5) - 12)); _actor1.setPosition(Common::Point(355 - ((R2_GLOBALS._v565E3 * 8) / 5), ((R2_GLOBALS._v565E1 + 20 ) / 5) - 12));
@ -6132,7 +6132,7 @@ void Scene700::remove() {
R2_GLOBALS._sound1.play(10); R2_GLOBALS._sound1.play(10);
// CHECKME: Present in the original... But it crashes badly. // CHECKME: Present in the original... But it crashes badly.
// The instruction was removed as it's not used in other scene coded the same way // The instruction was removed as it's not used in other scene coded the same way
// and reversed by dreammaster. A double check is required in order to verify it doesn't hide // and reversed by dreammaster. A double check is required in order to verify it doesn't hide
// a memory leak // a memory leak
// _rotation->remove(); // _rotation->remove();
SceneExt::remove(); SceneExt::remove();
@ -6445,7 +6445,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
if (R2_INVENTORY.getObjectScene(R2_READER) == 800) { if (R2_INVENTORY.getObjectScene(R2_READER) == 800) {
_reader.postInit(); _reader.postInit();
if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) { if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
_opticalFibre.setup(800, 4, 1); _opticalFibre.setup(800, 4, 1);
_reader.hide(); _reader.hide();
@ -6776,7 +6776,7 @@ void Scene825::process(Event &event) {
} }
void Scene825::dispatch() { void Scene825::dispatch() {
if (R2_GLOBALS._sceneObjects->contains(&_object4) && if (R2_GLOBALS._sceneObjects->contains(&_object4) &&
((_object4._frame == 1) || (_object4._frame == 3)) && ((_object4._frame == 1) || (_object4._frame == 3)) &&
(_object4._frame != _frame1)) { (_object4._frame != _frame1)) {
_sound2.play(25); _sound2.play(25);
@ -6828,7 +6828,7 @@ void Scene825::doButtonPress(int buttonId) {
_sceneText.setup(NO_TREATMENT_REQUIRED); _sceneText.setup(NO_TREATMENT_REQUIRED);
} else { } else {
_button6._buttonId = 5; _button6._buttonId = 5;
_object5.postInit(); _object5.postInit();
setAction(&_sequenceManager1, this, 827, &_object5, NULL); setAction(&_sequenceManager1, this, 827, &_object5, NULL);
} }
@ -6853,7 +6853,7 @@ void Scene825::doButtonPress(int buttonId) {
case 4: case 4:
_sound4.play(27); _sound4.play(27);
_button6._buttonId = 5; _button6._buttonId = 5;
_object1.postInit(); _object1.postInit();
_object1.setup(826, 7, 1); _object1.setup(826, 7, 1);
_object1.setPosition(Common::Point(112, 67)); _object1.setPosition(Common::Point(112, 67));
@ -7002,7 +7002,7 @@ bool Scene850::Panel::startAction(CursorType action, Event &event) {
scene->_sceneMode = 852; scene->_sceneMode = 852;
scene->setAction(&scene->_sequenceManager1, scene, 852, &R2_GLOBALS._player, this, &scene->_object1, NULL); scene->setAction(&scene->_sequenceManager1, scene, 852, &R2_GLOBALS._player, this, &scene->_object1, NULL);
return true; return true;
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@ -7171,7 +7171,7 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
scene->_aSound1.play(53); scene->_aSound1.play(53);
setup(900, 3, 9); setup(900, 3, 9);
R2_GLOBALS._v565E5 = 0; R2_GLOBALS._v565E5 = 0;
if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) { if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
scene->_actor2.animate(ANIM_MODE_5, NULL); scene->_actor2.animate(ANIM_MODE_5, NULL);
} else if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8)) { } else if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8)) {
@ -7292,7 +7292,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_actor2.postInit(); _actor2.postInit();
_actor2.setPosition(Common::Point(0, 0)); _actor2.setPosition(Common::Point(0, 0));
_actor2.fixPriority(1); _actor2.fixPriority(1);
if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) { if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) {
if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 700) { if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 700) {
_actor2.setup(901, 3, 2); _actor2.setup(901, 3, 2);
@ -7321,7 +7321,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
void Scene900::remove() { void Scene900::remove() {
if (_sceneMode != 901) if (_sceneMode != 901)
R2_GLOBALS._sound1.play(10); R2_GLOBALS._sound1.play(10);
SceneExt::remove(); SceneExt::remove();
} }
@ -7348,7 +7348,7 @@ void Scene900::signal() {
break; break;
case 2: case 2:
_field412 = 2; _field412 = 2;
_actor5.remove(); _actor5.remove();
_actor6.remove(); _actor6.remove();
@ -7358,7 +7358,7 @@ void Scene900::signal() {
else else
_actor5.setup(900, 3, 11); _actor5.setup(900, 3, 11);
_actor5.setPosition(Common::Point(36, 166)); _actor5.setPosition(Common::Point(36, 166));
_actor7.sub96135(5); _actor7.sub96135(5);
_actor7.setup(900, 3, 3); _actor7.setup(900, 3, 3);
_actor7.setPosition(Common::Point(76, 134)); _actor7.setPosition(Common::Point(76, 134));
@ -7374,7 +7374,7 @@ void Scene900::signal() {
_actor10.sub96135(7); _actor10.sub96135(7);
_actor10.setup(900, 3, 5); _actor10.setup(900, 3, 5);
_actor10.setPosition(Common::Point(99, 144)); _actor10.setPosition(Common::Point(99, 144));
break; break;
case 3: case 3:
_field412 = 3; _field412 = 3;
@ -7405,11 +7405,11 @@ void Scene900::signal() {
R2_GLOBALS._player._canWalk = false; R2_GLOBALS._player._canWalk = false;
_actor1.setup(900, 1, 1); _actor1.setup(900, 1, 1);
_actor4.sub96135(1); _actor4.sub96135(1);
_actor4.setup(900, 1, 3); _actor4.setup(900, 1, 3);
_actor4.setPosition(Common::Point(77, 168)); _actor4.setPosition(Common::Point(77, 168));
_sceneMode = 1; _sceneMode = 1;
signal(); signal();
break; break;

14
engines/tsage/ringworld2/ringworld2_scenes0.h
View File

@ -45,9 +45,9 @@ class Scene50: public SceneExt {
public: public:
void signal(); void signal();
}; };
public: public:
Action1 _action1; Action1 _action1;
virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void process(Event &event); virtual void process(Event &event);
@ -208,7 +208,7 @@ public:
SequenceManager _sequenceManager; SequenceManager _sequenceManager;
Action1 _action1; Action1 _action1;
ASoundExt _sound1; ASoundExt _sound1;
int _frameNumber; int _frameNumber;
int _field412, _field480; int _field412, _field480;
int _field482, _frameInc; int _field482, _frameInc;
@ -217,7 +217,7 @@ public:
public: public:
Scene180(); Scene180();
virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
virtual void remove(); virtual void remove();
virtual void signal(); virtual void signal();
@ -283,7 +283,7 @@ class Scene205: public SceneExt {
}; };
private: private:
void setup(); void setup();
void processList(Object **ObjList, int count, const Common::Rect &bounds, void processList(Object **ObjList, int count, const Common::Rect &bounds,
int xMultiply, int yMultiply, int xCenter, int yCenter); int xMultiply, int yMultiply, int xCenter, int yCenter);
void handleText(); void handleText();
public: public:
@ -445,7 +445,7 @@ class Scene325: public SceneExt {
void showIcon(); void showIcon();
void hideIcon(); void hideIcon();
}; };
private: private:
void removeText(); void removeText();
void consoleAction(int id); void consoleAction(int id);
@ -531,7 +531,7 @@ class Scene500: public SceneExt {
public: public:
virtual bool startAction(CursorType action, Event &event); virtual bool startAction(CursorType action, Event &event);
}; };
/* Objects */ /* Objects */
class Object2: public SceneActor { class Object2: public SceneActor {
public: public:

870
engines/tsage/ringworld2/ringworld2_scenes1.cpp
View File

File diff suppressed because it is too large Load Diff

20
engines/tsage/ringworld2/ringworld2_scenes1.h
View File

@ -142,7 +142,7 @@ class Scene1200 : public SceneExt {
virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY); virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum); virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
}; };
public: public:
NamedHotspot _item1; NamedHotspot _item1;
SceneActor _actor1; SceneActor _actor1;
@ -567,7 +567,7 @@ class Scene1575 : public SceneExt {
public: public:
int _field34; int _field34;
int _field36; int _field36;
Hotspot1(); Hotspot1();
void synchronize(Serializer &s); void synchronize(Serializer &s);
void subA910D(int indx); void subA910D(int indx);
@ -750,7 +750,7 @@ public:
Exit2 _exit2; Exit2 _exit2;
Exit3 _exit3; Exit3 _exit3;
SequenceManager _sequenceManager; SequenceManager _sequenceManager;
int _field77A; int _field77A;
int _field77C; int _field77C;
@ -772,7 +772,7 @@ class Scene1750 : public SceneExt {
int _fieldAA; int _fieldAA;
int _fieldAC; int _fieldAC;
int _fieldAE; int _fieldAE;
Actor4(); Actor4();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
void subB1A76(int arg1, int arg2, int arg3, int arg4, int arg5); void subB1A76(int arg1, int arg2, int arg3, int arg4, int arg5);
@ -782,11 +782,11 @@ class Scene1750 : public SceneExt {
virtual void process(Event &event); virtual void process(Event &event);
virtual bool startAction(CursorType action, Event &event); virtual bool startAction(CursorType action, Event &event);
}; };
class Actor5 : public SceneActor { class Actor5 : public SceneActor {
public: public:
int _fieldA4; int _fieldA4;
Actor5(); Actor5();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
@ -845,7 +845,7 @@ class Scene1800 : public SceneExt {
public: public:
virtual bool startAction(CursorType action, Event &event); virtual bool startAction(CursorType action, Event &event);
}; };
class Exit1 : public SceneExit { class Exit1 : public SceneExit {
public: public:
virtual void changeScene(); virtual void changeScene();
@ -897,7 +897,7 @@ class Scene1850 : public SceneExt {
public: public:
virtual bool startAction(CursorType action, Event &event); virtual bool startAction(CursorType action, Event &event);
}; };
public: public:
int _field412; int _field412;
int _field414; int _field414;
@ -936,11 +936,11 @@ class Scene1875 : public SceneExt {
public: public:
int _fieldA4; int _fieldA4;
int _fieldA6; int _fieldA6;
Actor1875(); Actor1875();
void subB84AB(); void subB84AB();
void subB8271(int indx); void subB8271(int indx);
void synchronize(Serializer &s); void synchronize(Serializer &s);
virtual void process(Event &event); virtual void process(Event &event);
}; };

48
engines/tsage/ringworld2/ringworld2_scenes2.cpp
View File

@ -261,7 +261,7 @@ void Scene2000::initExits() {
_mazePlayerMode = 0; _mazePlayerMode = 0;
} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2350) } else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2350)
_mazePlayerMode = 1; _mazePlayerMode = 1;
else else
_mazePlayerMode = 10; _mazePlayerMode = 10;
R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2000; R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2000;
R2_GLOBALS._sceneManager._previousScene = 2000; R2_GLOBALS._sceneManager._previousScene = 2000;
@ -422,12 +422,12 @@ void Scene2000::Action1::signal() {
default: default:
break; break;
} }
if (R2_GLOBALS._v56605[3 + _state] == R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]) if (R2_GLOBALS._v56605[3 + _state] == R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex])
scene->_objList1[_state].show(); scene->_objList1[_state].show();
else else
scene->_objList1[_state].hide(); scene->_objList1[_state].hide();
signal(); signal();
break; break;
case 5: { case 5: {
@ -783,7 +783,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._sound1.play(200); R2_GLOBALS._sound1.play(200);
initExits(); initExits();
g_globals->_sceneManager._fadeMode = FADEMODE_IMMEDIATE; g_globals->_sceneManager._fadeMode = FADEMODE_IMMEDIATE;
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
@ -1003,9 +1003,9 @@ void Scene2000::signal() {
} }
void Scene2000::process(Event &event) { void Scene2000::process(Event &event) {
if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) && if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) &&
(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)) { (R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)) {
Common::Point pt(event.mousePos.x, 129); Common::Point pt(event.mousePos.x, 129);
PlayerMover *mover = new PlayerMover(); PlayerMover *mover = new PlayerMover();
R2_GLOBALS._player.addMover(mover, &pt, this); R2_GLOBALS._player.addMover(mover, &pt, this);
@ -1048,7 +1048,7 @@ bool Scene2350::Actor3::startAction(CursorType action, Event &event) {
void Scene2350::ExitUp::changeScene() { void Scene2350::ExitUp::changeScene() {
Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene; Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS); R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
scene->_sceneMode = 12; scene->_sceneMode = 12;
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
@ -1056,7 +1056,7 @@ void Scene2350::ExitUp::changeScene() {
else else
scene->setAction(&scene->_sequenceManager, scene, 2352, &R2_GLOBALS._player, NULL); scene->setAction(&scene->_sequenceManager, scene, 2352, &R2_GLOBALS._player, NULL);
} }
void Scene2350::ExitWest::changeScene() { void Scene2350::ExitWest::changeScene() {
Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene; Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
@ -1129,7 +1129,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
if (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex] == 34) { if (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex] == 34) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_sceneMode = 2351; _sceneMode = 2351;
else else
_sceneMode = 2353; _sceneMode = 2353;
setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL); setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
} else { } else {
@ -1147,7 +1147,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
} }
R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2350; R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2350;
} }
void Scene2350::remove() { void Scene2350::remove() {
R2_GLOBALS._sound1.fadeOut(NULL); R2_GLOBALS._sound1.fadeOut(NULL);
SceneExt::remove(); SceneExt::remove();
@ -1189,7 +1189,7 @@ void Scene2350::signal() {
} }
void Scene2350::process(Event &event) { void Scene2350::process(Event &event) {
if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) && if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) &&
(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){ (R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){
Common::Point pt(event.mousePos.x, 129); Common::Point pt(event.mousePos.x, 129);
PlayerMover *mover = new PlayerMover(); PlayerMover *mover = new PlayerMover();
@ -1205,7 +1205,7 @@ void Scene2350::process(Event &event) {
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
void Scene2400::Exit1::changeScene() { void Scene2400::Exit1::changeScene() {
Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene; Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 10; scene->_sceneMode = 10;
@ -1214,7 +1214,7 @@ void Scene2400::Exit1::changeScene() {
R2_GLOBALS._player.addMover(mover, &pt, scene); R2_GLOBALS._player.addMover(mover, &pt, scene);
} }
void Scene2400::Exit2::changeScene() { void Scene2400::Exit2::changeScene() {
Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene; Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
@ -1244,7 +1244,7 @@ void Scene2400::postInit(SceneObjectList *OwnerList) {
setAction(&_sequenceManager, this, 2401, &R2_GLOBALS._player, NULL); setAction(&_sequenceManager, this, 2401, &R2_GLOBALS._player, NULL);
} }
} }
void Scene2400::signal() { void Scene2400::signal() {
switch (_sceneMode) { switch (_sceneMode) {
case 10: case 10:
@ -1339,7 +1339,7 @@ bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
} }
} else if (R2_GLOBALS._events.getCursor() == R2_GUNPOWDER) } else if (R2_GLOBALS._events.getCursor() == R2_GUNPOWDER)
return false; return false;
else else
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
} }
@ -1405,7 +1405,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
_actor1.setup(2426, 1, 1); _actor1.setup(2426, 1, 1);
else else
_actor1.setup(2426, 1, 2); _actor1.setup(2426, 1, 2);
_actor1.setPosition(Common::Point(290, 9)); _actor1.setPosition(Common::Point(290, 9));
_actor1.fixPriority(20); _actor1.fixPriority(20);
_actor1.setDetails(2455, 12, -1, -1, 1, (SceneItem *)NULL); _actor1.setDetails(2455, 12, -1, -1, 1, (SceneItem *)NULL);
@ -1511,7 +1511,7 @@ bool Scene2430::Actor3::startAction(CursorType action, Event &event) {
void Scene2430::Exit1::changeScene() { void Scene2430::Exit1::changeScene() {
Scene2430 *scene = (Scene2430 *)R2_GLOBALS._sceneManager._scene; Scene2430 *scene = (Scene2430 *)R2_GLOBALS._sceneManager._scene;
scene->_sceneMode = 0; scene->_sceneMode = 0;
R2_GLOBALS._events.setCursor(R2_NEGATOR_GUN); R2_GLOBALS._events.setCursor(R2_NEGATOR_GUN);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -1790,7 +1790,7 @@ bool Scene2440::Actor2::startAction(CursorType action, Event &event) {
scene->_sceneMode = 2440; scene->_sceneMode = 2440;
scene->setAction(&scene->_sequenceManager, scene, 2440, &R2_GLOBALS._player, &scene->_actor2, NULL); scene->setAction(&scene->_sequenceManager, scene, 2440, &R2_GLOBALS._player, &scene->_actor2, NULL);
return true; return true;
} }
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
} }
@ -2296,7 +2296,7 @@ void Scene2455::postInit(SceneObjectList *OwnerList) {
_actor1.setup(2456, 3, 3); _actor1.setup(2456, 3, 3);
_actor1.setPosition(Common::Point(162, 165)); _actor1.setPosition(Common::Point(162, 165));
_actor1.setDetails(2455, 15, 1, -1, 1, (SceneItem *)NULL); _actor1.setDetails(2455, 15, 1, -1, 1, (SceneItem *)NULL);
} }
} else { } else {
_actor3.postInit(); _actor3.postInit();
_actor3.setup(2456, 3, 1); _actor3.setup(2456, 3, 1);
@ -2309,9 +2309,9 @@ void Scene2455::postInit(SceneObjectList *OwnerList) {
_actor2.setup(2456, 3, 2); _actor2.setup(2456, 3, 2);
_actor2.setDetails(2455, 9, 1, -1, 1, (SceneItem *)NULL); _actor2.setDetails(2455, 9, 1, -1, 1, (SceneItem *)NULL);
} else { } else {
if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455)) if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455))
_actor2.setup(2455, 1, 1); _actor2.setup(2455, 1, 1);
else else
_actor2.setup(2456, 1, 1); _actor2.setup(2456, 1, 1);
_actor2.setDetails(2455, 3, 1, -1, 1, (SceneItem *)NULL); _actor2.setDetails(2455, 3, 1, -1, 1, (SceneItem *)NULL);
} }
@ -3679,7 +3679,7 @@ void Scene2700::process(Event &event) {
break; break;
} }
} }
} }
} }
Scene::process(event); Scene::process(event);
} }
@ -4184,7 +4184,7 @@ bool Scene2800::Actor1::startAction(CursorType action, Event &event) {
scene->_sceneMode = 10; scene->_sceneMode = 10;
scene->setAction(&scene->_sequenceManager, scene, 2802, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor1, NULL); scene->setAction(&scene->_sequenceManager, scene, 2802, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor1, NULL);
return true; return true;
} else } else
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
} }
@ -4432,7 +4432,7 @@ void Scene2800::postInit(SceneObjectList *OwnerList) {
_actor1.animate(ANIM_MODE_NONE, NULL); _actor1.animate(ANIM_MODE_NONE, NULL);
_actor1.setDetails(2800, -1, -1, -1, 1, (SceneItem *)NULL); _actor1.setDetails(2800, -1, -1, -1, 1, (SceneItem *)NULL);
} }
_item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL); _item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL);
_stripManager.setColors(60, 255); _stripManager.setColors(60, 255);

230
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View File

@ -30,7 +30,7 @@ namespace TsAGE {
namespace Ringworld2 { namespace Ringworld2 {
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3100 - * Scene 3100 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3100::Scene3100() { Scene3100::Scene3100() {
@ -131,7 +131,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
_guard.changeZoom(50); _guard.changeZoom(50);
_guard.setPosition(Common::Point(10, 149)); _guard.setPosition(Common::Point(10, 149));
_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL); _guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
_actor4.postInit(); _actor4.postInit();
_actor4.setup(3103, 1, 1); _actor4.setup(3103, 1, 1);
_actor4.setPosition(Common::Point(278, 113)); _actor4.setPosition(Common::Point(278, 113));
@ -152,7 +152,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._sound1.play(243); R2_GLOBALS._sound1.play(243);
} }
R2_GLOBALS._player._oldCharacterScene[1] = 3100; R2_GLOBALS._player._oldCharacterScene[1] = 3100;
} }
@ -322,7 +322,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
_actor4.setup(3126, 1, 1); _actor4.setup(3126, 1, 1);
_actor4.setPosition(Common::Point(171, 160)); _actor4.setPosition(Common::Point(171, 160));
_actor4.fixPriority(201); _actor4.fixPriority(201);
_item3.setDetails(12, 3125, 9, 13, -1); _item3.setDetails(12, 3125, 9, 13, -1);
_item2.setDetails(11, 3125, 15, 13, -1); _item2.setDetails(11, 3125, 15, 13, -1);
_item1.setDetails(Rect(0, 0, 320, 200), 3125, 0, 1, 2, 1, NULL); _item1.setDetails(Rect(0, 0, 320, 200), 3125, 0, 1, 2, 1, NULL);
@ -442,7 +442,7 @@ bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
case CURSOR_USE: case CURSOR_USE:
if (R2_GLOBALS.getFlag(75)) if (R2_GLOBALS.getFlag(75))
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
scene->_sceneMode = 3151; scene->_sceneMode = 3151;
scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL); scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
@ -504,7 +504,7 @@ bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL); scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
return true; return true;
} }
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
} }
@ -554,7 +554,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
_actor2.postInit(); _actor2.postInit();
_actor2.setPosition(Common::Point(64, 139)); _actor2.setPosition(Common::Point(64, 139));
if (R2_GLOBALS.getFlag(78)) { if (R2_GLOBALS.getFlag(78)) {
@ -686,7 +686,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
_actor5.postInit(); _actor5.postInit();
_actor5._effect = 6; _actor5._effect = 6;
_actor5._shade = 3; _actor5._shade = 3;
setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor5, NULL); setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor5, NULL);
} else { } else {
if (R2_GLOBALS._v56AA0 != 2) if (R2_GLOBALS._v56AA0 != 2)
@ -1699,7 +1699,7 @@ void Scene3350::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3375 - * Scene 3375 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3375::Scene3375() { Scene3375::Scene3375() {
@ -1799,13 +1799,13 @@ bool Scene3375::Actor1::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3304, scene); scene->_stripManager.start(3304, scene);
return true; return true;
} }
@ -1814,13 +1814,13 @@ bool Scene3375::Actor2::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3301, scene); scene->_stripManager.start(3301, scene);
return true; return true;
} }
@ -1829,10 +1829,10 @@ bool Scene3375::Actor3::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
scene->_stripManager.start(3303, scene); scene->_stripManager.start(3303, scene);
return true; return true;
} }
@ -1841,7 +1841,7 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
if (action != CURSOR_USE) if (action != CURSOR_USE)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
if (R2_GLOBALS._v56A9E != 0) { if (R2_GLOBALS._v56A9E != 0) {
R2_GLOBALS._walkRegions.disableRegion(2); R2_GLOBALS._walkRegions.disableRegion(2);
R2_GLOBALS._walkRegions.disableRegion(3); R2_GLOBALS._walkRegions.disableRegion(3);
@ -1855,10 +1855,10 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
R2_GLOBALS._walkRegions.disableRegion(8); R2_GLOBALS._walkRegions.disableRegion(8);
R2_GLOBALS._player.disableControl(CURSOR_ARROW); R2_GLOBALS._player.disableControl(CURSOR_ARROW);
scene->_sceneMode = 3375; scene->_sceneMode = 3375;
scene->setAction(&scene->_sequenceManager, scene, 3375, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL); scene->setAction(&scene->_sequenceManager, scene, 3375, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
return true; return true;
} }
@ -1944,10 +1944,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
_field148A[1] = 3377; _field148A[1] = 3377;
_field148A[2] = 3375; _field148A[2] = 3375;
_field148A[3] = 3378; _field148A[3] = 3378;
loadScene(_field148A[R2_GLOBALS._v56A9E]); loadScene(_field148A[R2_GLOBALS._v56A9E]);
SceneExt::postInit(); SceneExt::postInit();
R2_GLOBALS._sound1.play(313); R2_GLOBALS._sound1.play(313);
_stripManager.setColors(60, 255); _stripManager.setColors(60, 255);
@ -1963,14 +1963,14 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
setZoomPercents(126, 55, 200, 167); setZoomPercents(126, 55, 200, 167);
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
if (R2_GLOBALS._player._characterIndex == 2) { if (R2_GLOBALS._player._characterIndex == 2) {
R2_GLOBALS._player._moveDiff = Common::Point(5, 3); R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
} else { } else {
R2_GLOBALS._player._moveDiff = Common::Point(3, 2); R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
} }
R2_GLOBALS._player.changeZoom(-1); R2_GLOBALS._player.changeZoom(-1);
switch (R2_GLOBALS._player._characterIndex) { switch (R2_GLOBALS._player._characterIndex) {
case 2: case 2:
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
@ -1991,7 +1991,7 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.setup(10, 3, 1); R2_GLOBALS._player.setup(10, 3, 1);
break; break;
} }
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -2005,21 +2005,21 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
} }
_actor1.changeZoom(-1); _actor1.changeZoom(-1);
_actor1._effect = 1; _actor1._effect = 1;
int tmpStrip, tmpVisage; int tmpStrip, tmpVisage;
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
tmpStrip = 1; tmpStrip = 1;
else else
tmpStrip = 4; tmpStrip = 4;
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
tmpVisage = 10; tmpVisage = 10;
else else
tmpVisage = 20; tmpVisage = 20;
_actor1.setup(tmpVisage, tmpStrip, 1); _actor1.setup(tmpVisage, tmpStrip, 1);
_actor1.animate(ANIM_MODE_1, NULL); _actor1.animate(ANIM_MODE_1, NULL);
_actor2.postInit(); _actor2.postInit();
_actor2._moveDiff = Common::Point(3, 2); _actor2._moveDiff = Common::Point(3, 2);
_actor2.changeZoom(-1); _actor2.changeZoom(-1);
@ -2033,10 +2033,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
tmpVisage = 10; tmpVisage = 10;
else else
tmpVisage = 30; tmpVisage = 30;
_actor2.setup(tmpVisage, tmpStrip, 1); _actor2.setup(tmpVisage, tmpStrip, 1);
_actor2.animate(ANIM_MODE_1, NULL); _actor2.animate(ANIM_MODE_1, NULL);
_actor3.postInit(); _actor3.postInit();
_actor3._moveRate = 7; _actor3._moveRate = 7;
_actor3._moveDiff = Common::Point(5, 3); _actor3._moveDiff = Common::Point(5, 3);
@ -2049,34 +2049,34 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
_actor3.setup(40, tmpStrip, 1); _actor3.setup(40, tmpStrip, 1);
_actor3.animate(ANIM_MODE_1, NULL); _actor3.animate(ANIM_MODE_1, NULL);
_actor2.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL); _actor2.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
_actor3.setDetails(3375, 21, -1, -1, 1, (SceneItem *)NULL); _actor3.setDetails(3375, 21, -1, -1, 1, (SceneItem *)NULL);
_actor1.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL); _actor1.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
_actor4.postInit(); _actor4.postInit();
_actor4.setup(3375, 1, 1); _actor4.setup(3375, 1, 1);
_actor4.setPosition(Common::Point(254, 166)); _actor4.setPosition(Common::Point(254, 166));
_actor4.fixPriority(140); _actor4.fixPriority(140);
_actor4.hide(); _actor4.hide();
_exit1.setDetails(Rect(0, 84, 24, 167), EXITCURSOR_W, 3375); _exit1.setDetails(Rect(0, 84, 24, 167), EXITCURSOR_W, 3375);
_exit1.setDest(Common::Point(65, 155)); _exit1.setDest(Common::Point(65, 155));
_exit2.setDetails(Rect(103, 152, 183, 170), SHADECURSOR_DOWN, 3375); _exit2.setDetails(Rect(103, 152, 183, 170), SHADECURSOR_DOWN, 3375);
_exit2.setDest(Common::Point(158, 151)); _exit2.setDest(Common::Point(158, 151));
_exit3.setDetails(Rect(180, 75, 213, 132), EXITCURSOR_E, 3375); _exit3.setDetails(Rect(180, 75, 213, 132), EXITCURSOR_E, 3375);
_exit3.setDest(Common::Point(201, 131)); _exit3.setDest(Common::Point(201, 131));
for (int i = 0; i <= 12; ++i) for (int i = 0; i <= 12; ++i)
_itemArray[i].setDetails(i, 3375, 3, -1, -1); _itemArray[i].setDetails(i, 3375, 3, -1, -1);
_item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, 1, 1, NULL); _item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, 1, 1, NULL);
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
_sceneMode = 3379; _sceneMode = 3379;
else else
_sceneMode = 0; _sceneMode = 0;
subFC696(_sceneMode); subFC696(_sceneMode);
} }
@ -2186,7 +2186,7 @@ void Scene3375::dispatch() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3385 - * Scene 3385 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3385::Scene3385() { Scene3385::Scene3385() {
@ -2204,13 +2204,13 @@ bool Scene3385::Actor1::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3304, scene); scene->_stripManager.start(3304, scene);
return true; return true;
} }
@ -2219,13 +2219,13 @@ bool Scene3385::Actor2::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3301, scene); scene->_stripManager.start(3301, scene);
return true; return true;
} }
@ -2234,10 +2234,10 @@ bool Scene3385::Actor3::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
scene->_stripManager.start(3303, scene); scene->_stripManager.start(3303, scene);
return true; return true;
} }
@ -2253,7 +2253,7 @@ bool Scene3385::Actor4::startAction(CursorType action, Event &event) {
scene->_sceneMode = 3386; scene->_sceneMode = 3386;
scene->setAction(&scene->_sequenceManager, scene, 3386, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL); scene->setAction(&scene->_sequenceManager, scene, 3386, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
return true; return true;
} }
@ -2303,21 +2303,21 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
setZoomPercents(102, 40, 200, 160); setZoomPercents(102, 40, 200, 160);
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
R2_GLOBALS._player._moveDiff = Common::Point(5, 3); R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
else else
R2_GLOBALS._player._moveDiff = Common::Point(3, 2); R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
R2_GLOBALS._player.changeZoom(-1); R2_GLOBALS._player.changeZoom(-1);
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
R2_GLOBALS._player.setup(20, _field11B2, 1); R2_GLOBALS._player.setup(20, _field11B2, 1);
else if (R2_GLOBALS._player._characterIndex == 3) else if (R2_GLOBALS._player._characterIndex == 3)
R2_GLOBALS._player.setup(30, _field11B2, 1); R2_GLOBALS._player.setup(30, _field11B2, 1);
else else
R2_GLOBALS._player.setup(10, _field11B2, 1); R2_GLOBALS._player.setup(10, _field11B2, 1);
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -2337,7 +2337,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
_actor1.setup(20, _field11B2, 1); _actor1.setup(20, _field11B2, 1);
_actor1.animate(ANIM_MODE_1, NULL); _actor1.animate(ANIM_MODE_1, NULL);
_actor1.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL); _actor1.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL);
_actor2.postInit(); _actor2.postInit();
_actor2._moveDiff = Common::Point(3, 2); _actor2._moveDiff = Common::Point(3, 2);
_actor2.changeZoom(-1); _actor2.changeZoom(-1);
@ -2356,15 +2356,15 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
_actor3.setup(40, _field11B2, 1); _actor3.setup(40, _field11B2, 1);
_actor3.animate(ANIM_MODE_1, NULL); _actor3.animate(ANIM_MODE_1, NULL);
_actor3.setDetails(3385, 15, -1, -1, 1, (SceneItem *) NULL); _actor3.setDetails(3385, 15, -1, -1, 1, (SceneItem *) NULL);
_exit1.setDetails(Rect(103, 152, 217, 170), SHADECURSOR_DOWN, 3395); _exit1.setDetails(Rect(103, 152, 217, 170), SHADECURSOR_DOWN, 3395);
_exit1.setDest(Common::Point(158, 151)); _exit1.setDest(Common::Point(158, 151));
_actor4.postInit(); _actor4.postInit();
_actor4.setPosition(Common::Point(160, 100)); _actor4.setPosition(Common::Point(160, 100));
_actor4.fixPriority(90); _actor4.fixPriority(90);
_actor4.setDetails(3385, 3, 4, -1, 1, (SceneItem *) NULL); _actor4.setDetails(3385, 3, 4, -1, 1, (SceneItem *) NULL);
if (R2_GLOBALS._sceneManager._previousScene == 3375) { if (R2_GLOBALS._sceneManager._previousScene == 3375) {
R2_GLOBALS._player.setPosition(Common::Point(158, 102)); R2_GLOBALS._player.setPosition(Common::Point(158, 102));
_actor1.setPosition(Common::Point(164, 100)); _actor1.setPosition(Common::Point(164, 100));
@ -2385,7 +2385,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
_actor4.setup(3385, 1, 1); _actor4.setup(3385, 1, 1);
_sceneMode = 3385; _sceneMode = 3385;
setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL); setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
} }
_item1.setDetails(Rect(0, 0, 320, 200), 3385, 0, -1, -1, 1, NULL); _item1.setDetails(Rect(0, 0, 320, 200), 3385, 0, -1, -1, 1, NULL);
R2_GLOBALS._v56A9E = 0; R2_GLOBALS._v56A9E = 0;
@ -2418,7 +2418,7 @@ void Scene3385::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3395 - * Scene 3395 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3395::Scene3395() { Scene3395::Scene3395() {
@ -2436,13 +2436,13 @@ bool Scene3395::Actor1::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3304, scene); scene->_stripManager.start(3304, scene);
return true; return true;
} }
@ -2451,13 +2451,13 @@ bool Scene3395::Actor2::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
scene->_stripManager.start(3302, scene); scene->_stripManager.start(3302, scene);
else else
scene->_stripManager.start(3301, scene); scene->_stripManager.start(3301, scene);
return true; return true;
} }
@ -2466,10 +2466,10 @@ bool Scene3395::Actor3::startAction(CursorType action, Event &event) {
if (action != CURSOR_TALK) if (action != CURSOR_TALK)
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
scene->_sceneMode = 9999; scene->_sceneMode = 9999;
scene->_stripManager.start(3303, scene); scene->_stripManager.start(3303, scene);
return true; return true;
} }
@ -2485,7 +2485,7 @@ bool Scene3395::Actor4::startAction(CursorType action, Event &event) {
scene->_sceneMode = 3396; scene->_sceneMode = 3396;
scene->setAction(&scene->_sequenceManager, scene, 3396, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL); scene->setAction(&scene->_sequenceManager, scene, 3396, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
return true; return true;
} }
@ -2523,21 +2523,21 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
setZoomPercents(51, 40, 200, 137); setZoomPercents(51, 40, 200, 137);
R2_GLOBALS._player.postInit(); R2_GLOBALS._player.postInit();
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
R2_GLOBALS._player._moveDiff = Common::Point(5, 3); R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
else else
R2_GLOBALS._player._moveDiff = Common::Point(3, 2); R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
R2_GLOBALS._player.changeZoom(-1); R2_GLOBALS._player.changeZoom(-1);
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
R2_GLOBALS._player.setup(20, _field142E, 1); R2_GLOBALS._player.setup(20, _field142E, 1);
else if (R2_GLOBALS._player._characterIndex == 3) else if (R2_GLOBALS._player._characterIndex == 3)
R2_GLOBALS._player.setup(30, _field142E, 1); R2_GLOBALS._player.setup(30, _field142E, 1);
else else
R2_GLOBALS._player.setup(10, _field142E, 1); R2_GLOBALS._player.setup(10, _field142E, 1);
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -2576,7 +2576,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
_actor3.setup(40, _field142E, 1); _actor3.setup(40, _field142E, 1);
_actor3.animate(ANIM_MODE_1, NULL); _actor3.animate(ANIM_MODE_1, NULL);
_actor3.setDetails(3385, 18, -1, -1, 1, (SceneItem *) NULL); _actor3.setDetails(3385, 18, -1, -1, 1, (SceneItem *) NULL);
_actor4.postInit(); _actor4.postInit();
_actor4.setPosition(Common::Point(159, 50)); _actor4.setPosition(Common::Point(159, 50));
_actor4.fixPriority(40); _actor4.fixPriority(40);
@ -2638,7 +2638,7 @@ void Scene3395::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3400 - * Scene 3400 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3400::Scene3400() { Scene3400::Scene3400() {
@ -2802,7 +2802,7 @@ void Scene3400::signal() {
_sceneMode = 3403; _sceneMode = 3403;
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_actor3, &_actor7, NULL); setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_actor3, &_actor7, NULL);
else else
setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL); setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL);
break; break;
case 3309: case 3309:
@ -2811,7 +2811,7 @@ void Scene3400::signal() {
_sceneMode = 3405; _sceneMode = 3405;
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL); setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL);
else else
setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL); setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL);
break; break;
case 3310: case 3310:
@ -2885,7 +2885,7 @@ void Scene3400::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3500 - * Scene 3500 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3500::Action1::Action1() { Scene3500::Action1::Action1() {
@ -2910,10 +2910,10 @@ void Scene3500::Action1::sub108670(int arg1) {
_field1E = arg1; _field1E = arg1;
_field20 = 1; _field20 = 1;
_field24 = 1; _field24 = 1;
scene->_actor9.setStrip(2); scene->_actor9.setStrip(2);
scene->_actor9.show(); scene->_actor9.show();
if (_field1E == 1) if (_field1E == 1)
scene->_actor6.show(); scene->_actor6.show();
else else
@ -2954,7 +2954,7 @@ void Scene3500::Action1::sub108732(int arg1) {
Common::Point pt(160, 73); Common::Point pt(160, 73);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
scene->_actor8.addMover(mover, &pt, NULL); scene->_actor8.addMover(mover, &pt, NULL);
scene->_fieldB9E = 160 - (_field1E * 2 * 160); scene->_fieldB9E = 160 - (_field1E * 2 * 160);
Common::Point pt2(scene->_fieldB9E, 73); Common::Point pt2(scene->_fieldB9E, 73);
NpcMover *mover2 = new NpcMover(); NpcMover *mover2 = new NpcMover();
@ -3153,7 +3153,7 @@ void Scene3500::sub107F71(int arg1) {
_action1.signal(); _action1.signal();
} else if (_action == 0) { } else if (_action == 0) {
_action1.sub108670(1); _action1.sub108670(1);
setAction(&_action1, &_actor1, NULL); setAction(&_action1, &_actor1, NULL);
} }
break; break;
case 104: case 104:
@ -3177,7 +3177,7 @@ void Scene3500::sub107F71(int arg1) {
_action1.signal(); _action1.signal();
} else if (_action == 0) { } else if (_action == 0) {
_action1.sub108670(-1); _action1.sub108670(-1);
setAction(&_action1, &_actor1, NULL); setAction(&_action1, &_actor1, NULL);
} }
break; break;
default: default:
@ -3221,16 +3221,16 @@ void Scene3500::Action1::signal() {
int var4 = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46; int var4 = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46;
int di = abs(var2 - scene->_field127A); int di = abs(var2 - scene->_field127A);
int var6 = abs(var4 - scene->_field127C); int var6 = abs(var4 - scene->_field127C);
if ((scene->_actor1._frame % 2) != 0) { if ((scene->_actor1._frame % 2) != 0) {
scene->_actor1._frameChange = _field1E; scene->_actor1._frameChange = _field1E;
scene->_actor1.setFrame(scene->_actor1.changeFrame()); scene->_actor1.setFrame(scene->_actor1.changeFrame());
} }
int var8 = (scene->_action1._field1E * 2 + scene->_field1276); int var8 = (scene->_action1._field1E * 2 + scene->_field1276);
if (var8 > 7) if (var8 > 7)
var8 = 1; var8 = 1;
else if (var8 < 1) else if (var8 < 1)
var8 = 7; var8 = 7;
switch (var8) { switch (var8) {
@ -3293,7 +3293,7 @@ void Scene3500::Action1::signal() {
Common::Point pt(scene->_fieldAF8, 73); Common::Point pt(scene->_fieldAF8, 73);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
scene->_actor8.addMover(mover, &pt, this); scene->_actor8.addMover(mover, &pt, this);
scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));; scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));;
scene->_actor9._moveDiff.x = 160 - scene->_field126E; scene->_actor9._moveDiff.x = 160 - scene->_field126E;
scene->_fieldB9E = 160; scene->_fieldB9E = 160;
@ -3315,7 +3315,7 @@ void Scene3500::Action1::signal() {
else else
scene->_actor8.setStrip(2); scene->_actor8.setStrip(2);
scene->_actor8.fixPriority(1); scene->_actor8.fixPriority(1);
scene->_actor9.setPosition(Common::Point(-160, 73)); scene->_actor9.setPosition(Common::Point(-160, 73));
scene->_actor9.setStrip(9); scene->_actor9.setStrip(9);
scene->_actor9.fixPriority(11); scene->_actor9.fixPriority(11);
@ -3343,12 +3343,12 @@ void Scene3500::Action1::signal() {
// The following code allows the switch to work properly. // The following code allows the switch to work properly.
warning("Checkme: fix for dead code"); warning("Checkme: fix for dead code");
int var_8 = (_field1E * 2 + scene->_field1276); int var_8 = (_field1E * 2 + scene->_field1276);
if (var_8 > 7) if (var_8 > 7)
var_8 = 1; var_8 = 1;
else if (var_8 < 1) else if (var_8 < 1)
var_8 = 7; var_8 = 7;
// //
switch (var_8 - 1) { switch (var_8 - 1) {
case 0: case 0:
// No break on purpose // No break on purpose
@ -3378,7 +3378,7 @@ void Scene3500::Action1::signal() {
Common::Point pt(160, 73); Common::Point pt(160, 73);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
scene->_actor8.addMover(mover, &pt, NULL); scene->_actor8.addMover(mover, &pt, NULL);
scene->_fieldB9E = 160 - (_field1E * 2 * 160); scene->_fieldB9E = 160 - (_field1E * 2 * 160);
Common::Point pt2(scene->_fieldB9E, 73); Common::Point pt2(scene->_fieldB9E, 73);
NpcMover *mover2 = new NpcMover(); NpcMover *mover2 = new NpcMover();
@ -3419,7 +3419,7 @@ void Scene3500::Action1::dispatch() {
if ((_actionIndex == 1) && (scene->_field126E <= 4)) { if ((_actionIndex == 1) && (scene->_field126E <= 4)) {
scene->_rotation->_idxChange = 0; scene->_rotation->_idxChange = 0;
signal(); signal();
} }
} }
void Scene3500::Action2::sub10831F(int arg1) { void Scene3500::Action2::sub10831F(int arg1) {
@ -3451,12 +3451,12 @@ void Scene3500::Action2::signal() {
scene->_fieldB9E = scene->_actor9._position.y; scene->_fieldB9E = scene->_actor9._position.y;
di = scene->_fieldB9E; di = scene->_fieldB9E;
} }
scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2); scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
Common::Point pt(si, 73 - (_field1E * 12)); Common::Point pt(si, 73 - (_field1E * 12));
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
scene->_actor8.addMover(mover, &pt, NULL); scene->_actor8.addMover(mover, &pt, NULL);
scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2); scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2);
Common::Point pt2(di, 73 - (_field1E * 12)); Common::Point pt2(di, 73 - (_field1E * 12));
NpcMover *mover2 = new NpcMover(); NpcMover *mover2 = new NpcMover();
@ -3474,7 +3474,7 @@ void Scene3500::Action2::signal() {
si = scene->_actor8._position.x; si = scene->_actor8._position.x;
di = scene->_actor9._position.x; di = scene->_actor9._position.x;
} }
scene->_actor7.sub1094ED(); scene->_actor7.sub1094ED();
scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2); scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
@ -3486,7 +3486,7 @@ void Scene3500::Action2::signal() {
Common::Point pt2(di, 73); Common::Point pt2(di, 73);
NpcMover *mover2 = new NpcMover(); NpcMover *mover2 = new NpcMover();
scene->_actor9.addMover(mover2, &pt2, NULL); scene->_actor9.addMover(mover2, &pt2, NULL);
scene->_actor3.setFrame2(2); scene->_actor3.setFrame2(2);
} }
break; break;
@ -3500,13 +3500,13 @@ bool Scene3500::Item4::startAction(CursorType action, Event &event) {
if (scene->_field1286 == 0) if (scene->_field1286 == 0)
return true; return true;
if (scene->_field1286 != 4) if (scene->_field1286 != 4)
return SceneHotspot::startAction(action, event); return SceneHotspot::startAction(action, event);
R2_GLOBALS._sound2.play(14); R2_GLOBALS._sound2.play(14);
scene->sub107F71(_field34); scene->sub107F71(_field34);
return true; return true;
} }
@ -3515,22 +3515,22 @@ void Scene3500::Actor7::process(Event &event) {
if (scene->_field1286 == 0) if (scene->_field1286 == 0)
return; return;
if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) { if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
_fieldAE = 1 + event.mousePos.y - _position.y; _fieldAE = 1 + event.mousePos.y - _position.y;
event.eventType = EVENT_NONE; event.eventType = EVENT_NONE;
} }
if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) { if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) {
_fieldAE = 0; _fieldAE = 0;
event.handled = true; event.handled = true;
if (scene->_action1._field24 == 0) if (scene->_action1._field24 == 0)
sub1094ED(); sub1094ED();
} }
if (_fieldAE == 0) if (_fieldAE == 0)
return; return;
R2_GLOBALS._sound2.play(338); R2_GLOBALS._sound2.play(338);
event.handled = true; event.handled = true;
@ -3550,10 +3550,10 @@ bool Scene3500::Actor7::startAction(CursorType action, Event &event) {
if (scene->_field1286 == 0) if (scene->_field1286 == 0)
return true; return true;
if (scene->_field1286 == 4) if (scene->_field1286 == 4)
return false; return false;
return SceneActor::startAction(action, event); return SceneActor::startAction(action, event);
} }
@ -3586,7 +3586,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
if (tmpIndex > 254) if (tmpIndex > 254)
tmpIndex--; tmpIndex--;
tmpPal[3 * i] = R2_GLOBALS._scenePalette._palette[3 * tmpIndex]; tmpPal[3 * i] = R2_GLOBALS._scenePalette._palette[3 * tmpIndex];
tmpPal[(3 * i) + 1] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 1]; tmpPal[(3 * i) + 1] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 1];
tmpPal[(3 * i) + 2] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 2]; tmpPal[(3 * i) + 2] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 2];
@ -3597,7 +3597,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1]; R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1];
R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2]; R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2];
} }
_actor7.sub109466(38, 165, 16, 32, _field1270); _actor7.sub109466(38, 165, 16, 32, _field1270);
_actor7.setDetails(3500, 6, 7, -1, 1, (SceneItem *)NULL); _actor7.setDetails(3500, 6, 7, -1, 1, (SceneItem *)NULL);
R2_GLOBALS._sound1.play(276); R2_GLOBALS._sound1.play(276);
@ -3696,7 +3696,7 @@ void Scene3500::signal() {
void Scene3500::process(Event &event) { void Scene3500::process(Event &event) {
if (_field1286 == 0) if (_field1286 == 0)
return; return;
if (event.eventType == EVENT_KEYPRESS) { if (event.eventType == EVENT_KEYPRESS) {
switch (event.kbd.keycode) { switch (event.kbd.keycode) {
case Common::KEYCODE_1: case Common::KEYCODE_1:
@ -3765,7 +3765,7 @@ void Scene3500::process(Event &event) {
break; break;
} }
} }
if (!event.handled) if (!event.handled)
_actor7.process(event); _actor7.process(event);
@ -3864,7 +3864,7 @@ void Scene3500::dispatch() {
var_a = abs(var_6 - di); var_a = abs(var_6 - di);
tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46)); tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6)) if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6))
|| (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E > 3) && (_action1._field24 != 0)) ) { || (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E > 3) && (_action1._field24 != 0)) ) {
di = var_6; di = var_6;
if ((tmpVar != 25) && (tmpVar != 26) && (tmpVar != 5) && (tmpVar != 14) && (tmpVar == 15)) if ((tmpVar != 25) && (tmpVar != 26) && (tmpVar != 5) && (tmpVar != 14) && (tmpVar == 15))
@ -3894,7 +3894,7 @@ void Scene3500::dispatch() {
break; break;
case 2: case 2:
tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46)); tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
if ( ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31)) if ( ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31))
|| (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) { || (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) {
R2_GLOBALS._sound2.play(339); R2_GLOBALS._sound2.play(339);
_rotation->_idxChange = 0; _rotation->_idxChange = 0;
@ -4003,7 +4003,7 @@ void Scene3500::dispatch() {
var_6 = _unkObj1.sub1097EF(di + 46) - 46; var_6 = _unkObj1.sub1097EF(di + 46) - 46;
var_a = abs(di - var_6); var_a = abs(di - var_6);
tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46)); tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6)) if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6))
|| (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E <= 3) && (_action1._field24 != 0)) ){ || (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E <= 3) && (_action1._field24 != 0)) ){
if ((tmpVar != 23) && (tmpVar != 24) && (tmpVar != 4) && (tmpVar != 14) && (tmpVar != 15)) if ((tmpVar != 23) && (tmpVar != 24) && (tmpVar != 4) && (tmpVar != 14) && (tmpVar != 15))
R2_GLOBALS._sound2.play(339); R2_GLOBALS._sound2.play(339);
@ -4179,7 +4179,7 @@ void Scene3500::dispatch() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3600 - * Scene 3600 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3600::Scene3600() { Scene3600::Scene3600() {
@ -4227,7 +4227,7 @@ void Scene3600::Action3600::signal() {
R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL); R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL);
} }
setDelay(1); setDelay(1);
warning("TODO: Palette fader using parameter 2 = 256"); warning("TODO: Palette fader using parameter 2 = 256");
R2_GLOBALS._scenePalette.fade((const byte *)&scene->_palette1._palette, true, _field20); R2_GLOBALS._scenePalette.fade((const byte *)&scene->_palette1._palette, true, _field20);
if (_field20 > 0) if (_field20 > 0)
_field20 -= 2; _field20 -= 2;
@ -4359,7 +4359,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0)); g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
R2_GLOBALS._v558B6.set(25, 0, 260, 200); R2_GLOBALS._v558B6.set(25, 0, 260, 200);
} }
loadScene(3600); loadScene(3600);
SceneExt::postInit(); SceneExt::postInit();
_field254C = 0; _field254C = 0;
@ -4502,7 +4502,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
_action1._field1E = 1; _action1._field1E = 1;
_action1._field20 = 0; _action1._field20 = 0;
_action1.setActionIndex(1); _action1.setActionIndex(1);
_actor3.setAction(&_action1); _actor3.setAction(&_action1);
_sceneMode = 3623; _sceneMode = 3623;
@ -4768,7 +4768,7 @@ void Scene3600::signal() {
R2_GLOBALS.setFlag(71); R2_GLOBALS.setFlag(71);
_sceneMode = 3626; _sceneMode = 3626;
setAction(&_sequenceManager1, this, 3626, &_actor13, NULL); setAction(&_sequenceManager1, this, 3626, &_actor13, NULL);
} }
break; break;
case 3624: case 3624:
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
@ -4946,7 +4946,7 @@ void Scene3700::signal() {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3800 - * Scene 3800 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
Scene3800::Scene3800() { Scene3800::Scene3800() {
@ -5227,7 +5227,7 @@ void Scene3800::postInit(SceneObjectList *OwnerList) {
_field412 = 0; _field412 = 0;
initScene3800(); initScene3800();
SceneExt::postInit(); SceneExt::postInit();
R2_GLOBALS._sound1.play(231); R2_GLOBALS._sound1.play(231);
@ -5338,7 +5338,7 @@ void Scene3800::process(Event &event) {
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Scene 3900 - * Scene 3900 -
* *
*--------------------------------------------------------------------------*/ *--------------------------------------------------------------------------*/
void Scene3900::Exit1::changeScene() { void Scene3900::Exit1::changeScene() {
@ -5350,7 +5350,7 @@ void Scene3900::Exit1::changeScene() {
R2_GLOBALS._v566AA = 1; R2_GLOBALS._v566AA = 1;
R2_GLOBALS._v566A8 = 1; R2_GLOBALS._v566A8 = 1;
scene->_sceneMode = 14; scene->_sceneMode = 14;
Common::Point pt(160, 115); Common::Point pt(160, 115);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
R2_GLOBALS._player.addMover(mover, &pt, scene); R2_GLOBALS._player.addMover(mover, &pt, scene);
@ -5365,7 +5365,7 @@ void Scene3900::Exit2::changeScene() {
R2_GLOBALS._v566AA = 2; R2_GLOBALS._v566AA = 2;
R2_GLOBALS._v566A8 = 1; R2_GLOBALS._v566A8 = 1;
scene->_sceneMode = 14; scene->_sceneMode = 14;
Common::Point pt(330, 145); Common::Point pt(330, 145);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
R2_GLOBALS._player.addMover(mover, &pt, scene); R2_GLOBALS._player.addMover(mover, &pt, scene);
@ -5380,7 +5380,7 @@ void Scene3900::Exit3::changeScene() {
R2_GLOBALS._v566AA = 3; R2_GLOBALS._v566AA = 3;
R2_GLOBALS._v566A8 = 1; R2_GLOBALS._v566A8 = 1;
scene->_sceneMode = 14; scene->_sceneMode = 14;
Common::Point pt(160, 220); Common::Point pt(160, 220);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
R2_GLOBALS._player.addMover(mover, &pt, scene); R2_GLOBALS._player.addMover(mover, &pt, scene);
@ -5395,7 +5395,7 @@ void Scene3900::Exit4::changeScene() {
R2_GLOBALS._v566AA = 4; R2_GLOBALS._v566AA = 4;
R2_GLOBALS._v566A8 = 1; R2_GLOBALS._v566A8 = 1;
scene->_sceneMode = 14; scene->_sceneMode = 14;
Common::Point pt(-10, 145); Common::Point pt(-10, 145);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();
R2_GLOBALS._player.addMover(mover, &pt, scene); R2_GLOBALS._player.addMover(mover, &pt, scene);
@ -5407,7 +5407,7 @@ void Scene3900::Exit5::changeScene() {
_enabled = false; _enabled = false;
R2_GLOBALS._player.disableControl(CURSOR_ARROW); R2_GLOBALS._player.disableControl(CURSOR_ARROW);
scene->_sceneMode = 13; scene->_sceneMode = 13;
if (R2_GLOBALS._v566A9 == 4) { if (R2_GLOBALS._v566A9 == 4) {
Common::Point pt(-10, 135); Common::Point pt(-10, 135);
NpcMover *mover = new NpcMover(); NpcMover *mover = new NpcMover();

12
engines/tsage/ringworld2/ringworld2_scenes3.h
View File

@ -494,7 +494,7 @@ public:
Exit1 _exit1; Exit1 _exit1;
Action1 _action1; Action1 _action1;
SequenceManager _sequenceManager; SequenceManager _sequenceManager;
int _field11B2; int _field11B2;
Scene3385(); Scene3385();
@ -536,7 +536,7 @@ public:
Actor4 _actor4; Actor4 _actor4;
Action1 _action1; Action1 _action1;
SequenceManager _sequenceManager; SequenceManager _sequenceManager;
int _field142E; int _field142E;
Scene3395(); Scene3395();
@ -600,10 +600,10 @@ class Scene3500 : public SceneExt {
class Item4 : public NamedHotspot { class Item4 : public NamedHotspot {
public: public:
int _field34; int _field34;
Item4(); Item4();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
virtual bool startAction(CursorType action, Event &event); virtual bool startAction(CursorType action, Event &event);
}; };
@ -615,7 +615,7 @@ class Scene3500 : public SceneExt {
int _fieldAA; int _fieldAA;
int _fieldAC; int _fieldAC;
int _fieldAE; int _fieldAE;
Actor7(); Actor7();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
@ -695,7 +695,7 @@ class Scene3600 : public SceneExt {
class Action3600: public ActionExt { class Action3600: public ActionExt {
public: public:
int _field1E, _field20; int _field1E, _field20;
Action3600(); Action3600();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
virtual void signal(); virtual void signal();

150
engines/tsage/ringworld2/ringworld2_speakers.cpp
View File

@ -159,7 +159,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
if (s.empty()) if (s.empty())
_numFrames = 0; _numFrames = 0;
if (_fieldF6) { if (_fieldF6) {
if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId) if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId)
_sceneText.hide(); _sceneText.hide();
@ -229,7 +229,7 @@ void SpeakerCaptain3210::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -285,7 +285,7 @@ void SpeakerChief1100::proc15() {
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
_object1._numFrames = 7; _object1._numFrames = 7;
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -342,7 +342,7 @@ void SpeakerGuard2800::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -382,7 +382,7 @@ void SpeakerJocko3200::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -405,7 +405,7 @@ void SpeakerJocko3220::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -428,7 +428,7 @@ void SpeakerJocko3230::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -442,7 +442,7 @@ void SpeakerJocko3230::proc15() {
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Classes related to MIRANDA // Classes related to MIRANDA
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() { SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() {
@ -472,7 +472,7 @@ void SpeakerMiranda300::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -507,7 +507,7 @@ void SpeakerMiranda1625::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(Common::Point(196, 65)); _object1.setPosition(Common::Point(196, 65));
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -547,7 +547,7 @@ void SpeakerMiranda3375::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -558,7 +558,7 @@ void SpeakerMiranda3375::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (scene->_actor1._position.y != 163) if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8); R2_GLOBALS._player.setStrip(8);
else else
@ -574,7 +574,7 @@ void SpeakerMiranda3375::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -597,7 +597,7 @@ void SpeakerMiranda3385::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -608,7 +608,7 @@ void SpeakerMiranda3385::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3375) if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -623,7 +623,7 @@ void SpeakerMiranda3385::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -646,7 +646,7 @@ void SpeakerMiranda3395::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -657,7 +657,7 @@ void SpeakerMiranda3395::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -673,7 +673,7 @@ void SpeakerMiranda3395::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -696,7 +696,7 @@ void SpeakerMiranda3400::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -740,7 +740,7 @@ void SpeakerMiranda3600::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 3) if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor12; _object2 = &scene->_actor12;
@ -858,7 +858,7 @@ void SpeakerNej2700::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -893,7 +893,7 @@ void SpeakerNej2750::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -925,7 +925,7 @@ void SpeakerNej2800::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1002,7 +1002,7 @@ void SpeakerPrivate3210::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1047,7 +1047,7 @@ void SpeakerProtector3600::proc15() {
R2_GLOBALS._player.disableControl(); R2_GLOBALS._player.disableControl();
R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS); R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1107,7 +1107,7 @@ void SpeakerQuinn300::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1122,7 +1122,7 @@ void SpeakerQuinn300::proc15() {
_object1.animate(ANIM_MODE_6, this); _object1.animate(ANIM_MODE_6, this);
} else { } else {
((SceneItem *)_action)->_sceneRegionId = 0; ((SceneItem *)_action)->_sceneRegionId = 0;
switch (_object2->_visage) { switch (_object2->_visage) {
case 10: case 10:
_object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1); _object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1);
@ -1158,7 +1158,7 @@ void SpeakerQuinn1100::proc15() {
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
_object1._numFrames = 7; _object1._numFrames = 7;
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1250,7 +1250,7 @@ void SpeakerQuinn2700::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1281,7 +1281,7 @@ void SpeakerQuinn2750::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1312,7 +1312,7 @@ void SpeakerQuinn2800::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1371,9 +1371,9 @@ void SpeakerQuinn3375::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else if (R2_GLOBALS._player._characterIndex == 2) else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -1384,7 +1384,7 @@ void SpeakerQuinn3375::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (scene->_actor1._position.y != 163) if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8); R2_GLOBALS._player.setStrip(8);
else else
@ -1399,7 +1399,7 @@ void SpeakerQuinn3375::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -1422,9 +1422,9 @@ void SpeakerQuinn3385::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else if (R2_GLOBALS._player._characterIndex == 2) else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -1435,7 +1435,7 @@ void SpeakerQuinn3385::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3375) if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -1450,7 +1450,7 @@ void SpeakerQuinn3385::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -1477,9 +1477,9 @@ void SpeakerQuinn3395::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else if (R2_GLOBALS._player._characterIndex == 2) else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -1490,7 +1490,7 @@ void SpeakerQuinn3395::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -1505,7 +1505,7 @@ void SpeakerQuinn3395::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -1532,9 +1532,9 @@ void SpeakerQuinn3400::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else if (R2_GLOBALS._player._characterIndex == 2) else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
else else
_object2 = &scene->_actor2; _object2 = &scene->_actor2;
@ -1581,7 +1581,7 @@ void SpeakerQuinn3600::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 1) if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor10; _object2 = &scene->_actor10;
@ -1736,7 +1736,7 @@ void SpeakerRalf3245::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1788,7 +1788,7 @@ void SpeakerRocko3200::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1811,7 +1811,7 @@ void SpeakerRocko3220::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1834,7 +1834,7 @@ void SpeakerRocko3230::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1879,7 +1879,7 @@ void SpeakerSeeker300::proc15() {
_object1.fixPriority(140); _object1.fixPriority(140);
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1918,7 +1918,7 @@ void SpeakerSeeker1100::proc15() {
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
_object1._numFrames = 7; _object1._numFrames = 7;
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -1974,7 +1974,7 @@ void SpeakerSeeker1900::proc15() {
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
_object1._numFrames = 7; _object1._numFrames = 7;
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2045,7 +2045,7 @@ void SpeakerSeeker3375::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
@ -2056,7 +2056,7 @@ void SpeakerSeeker3375::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (scene->_actor1._position.y != 163) if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8); R2_GLOBALS._player.setStrip(8);
else else
@ -2071,7 +2071,7 @@ void SpeakerSeeker3375::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -2094,7 +2094,7 @@ void SpeakerSeeker3385::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
@ -2105,7 +2105,7 @@ void SpeakerSeeker3385::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3375) if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -2120,7 +2120,7 @@ void SpeakerSeeker3385::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -2143,7 +2143,7 @@ void SpeakerSeeker3395::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
@ -2154,7 +2154,7 @@ void SpeakerSeeker3395::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -2169,7 +2169,7 @@ void SpeakerSeeker3395::proc15() {
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
switch (v) { switch (v) {
case 0: case 0:
@ -2192,7 +2192,7 @@ void SpeakerSeeker3400::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor1; _object2 = &scene->_actor1;
@ -2251,7 +2251,7 @@ void SpeakerSeeker3600::proc15() {
int v = _fieldF6; int v = _fieldF6;
if (!_object2) { if (!_object2) {
if (R2_GLOBALS._player._characterIndex == 2) if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player; _object2 = &R2_GLOBALS._player;
else else
_object2 = &scene->_actor11; _object2 = &scene->_actor11;
@ -2394,7 +2394,7 @@ void SpeakerSocko3200::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2434,7 +2434,7 @@ void SpeakerSoldier300::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2478,7 +2478,7 @@ void SpeakerTeal300::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2502,7 +2502,7 @@ void SpeakerTeal1625::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(Common::Point(68, 68)); _object1.setPosition(Common::Point(68, 68));
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2525,7 +2525,7 @@ void SpeakerTeal3240::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2677,7 +2677,7 @@ void SpeakerTomko3245::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2729,7 +2729,7 @@ void SpeakerWebbster3240::proc15() {
_object1.postInit(); _object1.postInit();
_object1.setPosition(_object2->_position); _object1.setPosition(_object2->_position);
if (_object2->_mover) if (_object2->_mover)
_object2->addMover(NULL); _object2->addMover(NULL);
} }
@ -2755,7 +2755,7 @@ void SpeakerWebbster3375::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (scene->_actor1._position.y != 163) if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8); R2_GLOBALS._player.setStrip(8);
else else
@ -2799,7 +2799,7 @@ void SpeakerWebbster3385::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3375) if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else
@ -2843,7 +2843,7 @@ void SpeakerWebbster3395::proc15() {
_object1._numFrames = 7; _object1._numFrames = 7;
_object1._effect = 1; _object1._effect = 1;
_object1.changeZoom(-1); _object1.changeZoom(-1);
if (R2_GLOBALS._sceneManager._previousScene == 3385) if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4); R2_GLOBALS._player.setStrip(4);
else else

6
engines/tsage/scenes.cpp
View File

@ -240,7 +240,7 @@ void SceneManager::listenerSynchronize(Serializer &s) {
if (s.isLoading()) { if (s.isLoading()) {
changeScene(_sceneNumber); changeScene(_sceneNumber);
if (_nextSceneNumber != -1) { if (_nextSceneNumber != -1) {
sceneChange(); sceneChange();
_nextSceneNumber = -1; _nextSceneNumber = -1;
@ -317,7 +317,7 @@ void Scene::loadSceneData(int sceneNum) {
_activeScreenNumber = sceneNum; _activeScreenNumber = sceneNum;
if (g_vm->getGameID() == GType_Ringworld2) { if (g_vm->getGameID() == GType_Ringworld2) {
// Most scenes in Ringworld 2 don't have a scene size resource, but rather just have // Most scenes in Ringworld 2 don't have a scene size resource, but rather just have
// a standard 320x200 size. Only read the scene size data for the specific few scenes // a standard 320x200 size. Only read the scene size data for the specific few scenes
switch (sceneNum) { switch (sceneNum) {
case 700: case 700:
@ -457,7 +457,7 @@ void Scene::refreshBackground(int xAmount, int yAmount) {
Rect destBounds(xSectionDest * 160, ySectionDest * 100, Rect destBounds(xSectionDest * 160, ySectionDest * 100,
(xSectionDest + 1) * 160, (ySectionDest + 1) * 100); (xSectionDest + 1) * 160, (ySectionDest + 1) * 100);
if (g_vm->getGameID() != GType_Ringworld) { if (g_vm->getGameID() != GType_Ringworld) {
// For Blue Force and Return to Ringworld, if the scene has an interface area, // For Blue Force and Return to Ringworld, if the scene has an interface area,
// exclude it from the copy // exclude it from the copy
srcBounds.bottom = MIN<int16>(srcBounds.bottom, BF_GLOBALS._interfaceY); srcBounds.bottom = MIN<int16>(srcBounds.bottom, BF_GLOBALS._interfaceY);
destBounds.bottom = MIN<int16>(destBounds.bottom, BF_GLOBALS._interfaceY); destBounds.bottom = MIN<int16>(destBounds.bottom, BF_GLOBALS._interfaceY);

4
engines/tsage/staticres.cpp
View File

@ -400,8 +400,8 @@ const byte k5A4D6[] = {
const byte k5A72E[] = {0, 98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70, 129, 190, 247}; const byte k5A72E[] = {0, 98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70, 129, 190, 247};
const byte k5A73F[] = {0, 42, 42, 42, 42, 67, 67, 67, 67, 92, 92, 92, 92, 116, 116, 116, 116}; const byte k5A73F[] = {0, 42, 42, 42, 42, 67, 67, 67, 67, 92, 92, 92, 92, 116, 116, 116, 116};
const byte k5A750[] = { const byte k5A750[] = {
9, 10, 7, 13, 7, 8, 9, 7, 9, 10, 9, 10, 7, 13, 7, 8, 9, 7, 9, 10,
2, 3, 3, 2, 2, 2, 4, 3, 3, 4, 2, 3, 3, 2, 2, 2, 4, 3, 3, 4,
3, 2, 3, 4, 3, 8, 10, 4, 0 3, 2, 3, 4, 3, 8, 10, 4, 0
}; };
const byte k5A76D[] = { const byte k5A76D[] = {

2
engines/tsage/user_interface.cpp
View File

@ -316,7 +316,7 @@ void UIElements::synchronize(Serializer &s) {
} }
void UIElements::process(Event &event) { void UIElements::process(Event &event) {
if (_clearScreen && GLOBALS._player._enabled && if (_clearScreen && GLOBALS._player._enabled &&
((g_vm->getGameID() != GType_BlueForce) || (GLOBALS._sceneManager._sceneNumber != 50))) { ((g_vm->getGameID() != GType_BlueForce) || (GLOBALS._sceneManager._sceneNumber != 50))) {
if (_bounds.contains(event.mousePos)) { if (_bounds.contains(event.mousePos)) {
// Cursor inside UI area // Cursor inside UI area