aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mads/messages.cpp4
-rw-r--r--engines/mads/nebular/nebular_scenes.cpp2
-rw-r--r--engines/mads/nebular/nebular_scenes1.cpp36
-rw-r--r--engines/mads/nebular/nebular_scenes1.h2
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp68
-rw-r--r--engines/mads/nebular/nebular_scenes3.cpp124
-rw-r--r--engines/mads/nebular/nebular_scenes4.cpp28
-rw-r--r--engines/mads/nebular/nebular_scenes6.cpp14
-rw-r--r--engines/mads/nebular/nebular_scenes7.cpp56
-rw-r--r--engines/mads/nebular/nebular_scenes8.cpp22
-rw-r--r--engines/mads/sequence.cpp23
-rw-r--r--engines/mads/sequence.h11
12 files changed, 196 insertions, 194 deletions
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index 4fd02cc814..263d8fa661 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -210,8 +210,8 @@ void KernelMessages::processText(int msgIndex) {
x1 = frame->getBounds().left;
y1 = frame->getBounds().top;
} else {
- x1 = seqEntry._msgPos.x;
- y1 = seqEntry._msgPos.y;
+ x1 = seqEntry._position.x;
+ y1 = seqEntry._position.y;
}
}
diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index f8c113e8c5..cbfc055b6f 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -420,7 +420,7 @@ void SceneTeleporter::teleporterHandleKey() {
_game._player._stepEnabled = false;
Common::Point msgPos = teleporterComputeLocation();
_handSequenceId = _scene->_sequences.startReverseCycle(_handSpriteId, false, 4, 2, 0, 0);
- _scene->_sequences.setMsgPosition(_handSequenceId, msgPos);
+ _scene->_sequences.setPosition(_handSequenceId, msgPos);
_scene->_sequences.setDepth(_handSequenceId, 2);
_scene->_sequences.addSubEntry(_handSequenceId, SEQUENCE_TRIGGER_LOOP, 0, 1);
_scene->_sequences.addSubEntry(_handSequenceId, SEQUENCE_TRIGGER_EXPIRE, 0, 2);
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 9fb3808c58..1b875ae9fe 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1671,14 +1671,14 @@ void Scene104::step() {
_globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('a', 0));
_vm->_palette->refreshSceneColors();
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], mirrorFl, 7, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(198, 143));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
break;
case 1:
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], mirrorFl, 7, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(198, 143));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -2, -2);
_scene->_sequences.addTimer(90, 2);
break;
@@ -1704,7 +1704,7 @@ void Scene104::step() {
_globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 1));
_vm->_palette->refreshSceneColors();
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 4);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 14);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -1712,7 +1712,7 @@ void Scene104::step() {
case 1:
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 4);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 15, 32);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -1720,7 +1720,7 @@ void Scene104::step() {
case 2:
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 3, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(198, 143));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], -2, -2);
_scene->_sequences.addTimer(90, 3);
break;
@@ -1746,7 +1746,7 @@ void Scene104::step() {
_globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 2));
_vm->_palette->refreshSceneColors();
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 8, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(198, 143));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
if (_game._storyMode >= STORYMODE_NICE)
@@ -1755,7 +1755,7 @@ void Scene104::step() {
case 1:
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 8, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(198, 143));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(198, 143));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], -2, -2);
_scene->_sequences.addTimer(90, 2);
break;
@@ -1842,7 +1842,7 @@ void Scene105::enter() {
if (_globals[kFishIn105]) {
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(48, 144));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(48, 144));
int idx = _scene->_dynamicHotspots.add(101, 348, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(56, 141), FACING_NORTHWEST);
@@ -1982,7 +1982,7 @@ Scene106::Scene106(MADSEngine *vm) : Scene1xx(vm) {
_backToShipFl = false;
_shadowFl = false;
_firstEmergingFl = false;
- _msgPosY = 0;
+ _positionY = 0;
}
void Scene106::synchronize(Common::Serializer &s) {
@@ -1991,7 +1991,7 @@ void Scene106::synchronize(Common::Serializer &s) {
s.syncAsByte(_backToShipFl);
s.syncAsByte(_shadowFl);
s.syncAsByte(_firstEmergingFl);
- s.syncAsSint32LE(_msgPosY);
+ s.syncAsSint32LE(_positionY);
}
void Scene106::setup() {
@@ -2093,7 +2093,7 @@ void Scene106::step() {
int msgId = -1;
switch (tmpVal) {
case 0:
- _msgPosY = 26;
+ _positionY = 26;
msgId = 49;
break;
@@ -2117,9 +2117,9 @@ void Scene106::step() {
if (msgId >= 0) {
int nextAbortVal = _game._trigger + 1;
- _scene->_kernelMessages.add(Common::Point(15, _msgPosY), 0x1110, 0, 0, 360, _game.getQuote(msgId));
+ _scene->_kernelMessages.add(Common::Point(15, _positionY), 0x1110, 0, 0, 360, _game.getQuote(msgId));
_scene->_sequences.addTimer(150, nextAbortVal);
- _msgPosY += 14;
+ _positionY += 14;
}
}
@@ -2233,7 +2233,7 @@ void Scene107::enter() {
if (_globals[kFishIn107]) {
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(68, 151));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(68, 151));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1);
int idx = _scene->_dynamicHotspots.add(101, 348, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(78, 135), FACING_SOUTHWEST);
@@ -2249,7 +2249,7 @@ void Scene107::enter() {
if (((_scene->_priorSceneId == 105) || (_scene->_priorSceneId == 106)) && (_vm->getRandomNumber(1, 3) == 1)) {
_globals._spriteIndexes[0] = _scene->_sprites.addSprites(Resources::formatName(105, 'R', 1, EXT_SS, ""));
_globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], true, 4, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[0], Common::Point(270, 150));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[0], Common::Point(270, 150));
_scene->_sequences.setMotion(_globals._sequenceIndexes[0], SEQUENCE_TRIGGER_SPRITE, -200, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[0], 2);
_scene->_dynamicHotspots.add(218, 348, _globals._sequenceIndexes[0], Common::Rect(0, 0, 0, 0));
@@ -2348,7 +2348,7 @@ void Scene108::enter() {
if (_globals[kFishIn108]) {
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(41, 109));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(41, 109));
int idx = _scene->_dynamicHotspots.add(101, 348, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(41, 109), FACING_NORTHWEST);
}
@@ -2508,7 +2508,7 @@ void Scene109::enter() {
_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], true, 4, 0, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 5);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(126, 39));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(126, 39));
_scene->_sequences.setMotion(_globals._sequenceIndexes[10], 0, 200, 0);
_scene->_sequences.setScale(_globals._sequenceIndexes[10], 80);
_game._player._stepEnabled = false;
@@ -2559,7 +2559,7 @@ void Scene109::step() {
_hungryFl = true;
}
- if (_eatingFirstFish && (_scene->_sequences[_globals._sequenceIndexes[10]]._msgPos.x >= 178)) {
+ if (_eatingFirstFish && (_scene->_sequences[_globals._sequenceIndexes[10]]._position.x >= 178)) {
_globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 4, 1, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_SPRITE, 29, 72);
diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h
index 9eb21349e4..96d2bb95eb 100644
--- a/engines/mads/nebular/nebular_scenes1.h
+++ b/engines/mads/nebular/nebular_scenes1.h
@@ -154,7 +154,7 @@ private:
bool _shadowFl;
bool _firstEmergingFl;
- int _msgPosY;
+ int _positionY;
public:
Scene106(MADSEngine *vm);
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index adb174c8ca..f93ea3931d 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -147,7 +147,7 @@ void Scene201::enter() {
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 4, 0, 0, 0);
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 0, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(185, 46));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(185, 46));
int idx = _scene->_dynamicHotspots.add(NOUN_BIRDS, 209, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(186, 81), FACING_NORTH);
@@ -401,14 +401,14 @@ void Scene202::enter() {
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 6, 0, 0, 0);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(149, 113));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(149, 113));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 10);
int idx = _scene->_dynamicHotspots.add(NOUN_BONE, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(153, 97), FACING_SOUTH);
if (!(_globals[kBone202Status] & 1)) {
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(130, 108));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(130, 108));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
idx = _scene->_dynamicHotspots.add(NOUN_BONE, VERB_WALKTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(132, 97), FACING_SOUTH);
@@ -416,7 +416,7 @@ void Scene202::enter() {
if (!(_globals[kBone202Status] & 2)) {
_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[6], Common::Point(166, 110));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[6], Common::Point(166, 110));
_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 10);
idx = _scene->_dynamicHotspots.add(NOUN_BONE, VERB_WALKTO, _globals._sequenceIndexes[6], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(165, 99), FACING_SOUTH);
@@ -468,7 +468,7 @@ void Scene202::enter() {
_globals._sequenceIndexes[10] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], true, 8);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(247, 82));
_game._player._playerPos = Common::Point(246, 124);
_game._player._facing = FACING_NORTH;
_globals[kTeleporterUnderstood] = true;
@@ -476,7 +476,7 @@ void Scene202::enter() {
_globals._sequenceIndexes[10] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 6);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
_game._player._playerPos = Common::Point(171, 122);
_game._player._facing = FACING_NORTH;
}
@@ -488,7 +488,7 @@ void Scene202::enter() {
_game._player._visible = false;
_scene->_sequences.startCycle(_globals._sequenceIndexes[9], true, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_game._player._playerPos = Common::Point(246, 124);
_game._player._facing = FACING_NORTH;
}
@@ -555,13 +555,13 @@ void Scene202::step() {
_vm->_sound->command(41);
_scene->_sequences.remove(_globals._sequenceIndexes[10]);
_globals._sequenceIndexes[9] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
break;
case 91:
_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], true, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_scene->_sequences.addTimer(60, 92);
break;
@@ -858,7 +858,7 @@ void Scene202::actions() {
break;
case 1: {
_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], true, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[8], _globals._sequenceIndexes[9]);
_ladderTopFl = true;
@@ -879,7 +879,7 @@ void Scene202::actions() {
_game._player._visible= false;
_globals._sequenceIndexes[10] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 6, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 1, 6);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[10]);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[10], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -887,7 +887,7 @@ void Scene202::actions() {
case 1:
_globals._sequenceIndexes[10] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 6);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
if (_scene->_activeAnimation) {
_waitingMeteoFl = true;
_globals[kMeteorologistWatch] = METEOROLOGIST_GROUND;
@@ -903,7 +903,7 @@ void Scene202::actions() {
_globals._sequenceIndexes[10] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[9], false, 6, 1, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 1, 6);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(172, 123));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[10], SEQUENCE_TRIGGER_EXPIRE, 0, 3);
break;
case 3:
@@ -922,13 +922,13 @@ void Scene202::actions() {
_game._player._stepEnabled = false;
_scene->_sequences.remove(_globals._sequenceIndexes[9]);
_globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
break;
case 1:
_globals._sequenceIndexes[10] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], true, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[10], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 1);
if (_scene->_activeAnimation) {
if (_scene->_activeAnimation->getCurrentFrame() > 200) {
@@ -955,13 +955,13 @@ void Scene202::actions() {
_meteorologistSpecial = false;
_scene->_sequences.remove(_globals._sequenceIndexes[10]);
_globals._sequenceIndexes[9] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[9], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 3);
break;
case 3:
_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], true, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
_game._player._stepEnabled = true;
break;
@@ -2661,7 +2661,7 @@ void Scene209::handleMonkeyFall() {
_globals._sequenceIndexes[8] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[8], false, 8, 1, 0, 0);
_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[9], oldIdx);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(201, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(201, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[8], oldIdx);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[8], 43, 72);
@@ -2760,7 +2760,7 @@ void Scene209::handleMonkey2() {
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(137));
_vm->_sound->command(22);
_globals._sequenceIndexes[12] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[12], false, 11, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[12], Common::Point(111, 133));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[12], Common::Point(111, 133));
_scene->_sequences.setScale(_globals._sequenceIndexes[12], 79);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[12], 1, 6);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 252);
@@ -2773,7 +2773,7 @@ void Scene209::handleMonkey2() {
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(132));
int oldIdx = _globals._sequenceIndexes[12];
_globals._sequenceIndexes[12] = _scene->_sequences.startCycle(_globals._spriteIndexes[12], false, 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[12], Common::Point(111, 133));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[12], Common::Point(111, 133));
_scene->_sequences.setScale(_globals._sequenceIndexes[12], 79);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[12], oldIdx);
_scene->_sequences.addTimer(120, 253);
@@ -2857,7 +2857,7 @@ void Scene209::enter() {
if (_game._objects.isInRoom(OBJ_BINOCULARS)) {
_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[9], Common::Point(201, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(201, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8);
int idx = _scene->_dynamicHotspots.add(39, 13, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(200, 133), FACING_NORTH);
@@ -3119,7 +3119,7 @@ void Scene209::step() {
_game._player._visible = false;
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 229);
break;
@@ -3127,7 +3127,7 @@ void Scene209::step() {
case 229: {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(35, 230);
@@ -3138,7 +3138,7 @@ void Scene209::step() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 231);
break;
@@ -3147,7 +3147,7 @@ void Scene209::step() {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 8, 10);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 232);
@@ -3160,7 +3160,7 @@ void Scene209::step() {
case 232: {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 10);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(2, 233);
@@ -3182,14 +3182,14 @@ void Scene209::step() {
if (_action.isAction(VERB_HOSE_DOWN, NOUN_BLOWGUN, NOUN_MONKEY)) {
_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 16, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 11, 12);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 12, 239);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 235);
} else if (_action.isAction(VERB_SHOOT, NOUN_BLOWGUN, NOUN_MONKEY)) {
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 11, 12);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 235);
_vm->_sound->command(23);
@@ -3199,7 +3199,7 @@ void Scene209::step() {
case 235: {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 13);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(12, 236);
@@ -3212,7 +3212,7 @@ void Scene209::step() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 14, 16);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(116, 131));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 237);
break;
@@ -4649,7 +4649,7 @@ void Scene211::enter() {
if (_vm->getRandomNumber(1, 8) == 1) {
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(202, 126));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(202, 126));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 8);
_scene->_sequences.setMotion(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, -200, 0);
_scene->_dynamicHotspots.add(324, 13, _globals._sequenceIndexes[2], Common::Rect(1, 1, 1 + 41, 1 + 10));
@@ -5041,7 +5041,7 @@ void Scene214::enter() {
if (_game._objects.isInRoom(OBJ_POISON_DARTS)) {
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(103, 86));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(103, 86));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 11);
} else {
_scene->_hotspots.activate(NOUN_POISON_DARTS, false);
@@ -5049,7 +5049,7 @@ void Scene214::enter() {
if (_game._objects.isInRoom(OBJ_BLOWGUN)) {
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(90, 87));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(90, 87));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13);
} else {
_scene->_hotspots.activate(NOUN_BLOWGUN, false);
@@ -5236,7 +5236,7 @@ void Scene215::enter() {
_globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 0));
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle (_globals._spriteIndexes[1], false, 7, 0, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(235, 83));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(235, 83));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
if (_globals[kSexOfRex] == REX_MALE)
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 11eb2f85e0..d54ffbdb2b 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -219,7 +219,7 @@ void Scene3xx::handleForceField(ForceField *force, int *sprites) {
if (id >= 0) {
force->_seqId[id] = _scene->_sequences.addSpriteCycle(sprites[spriteId], mirror, 2, 0, 0, 0);
_scene->_sequences.setDepth(force->_seqId[id], 8);
- _scene->_sequences.setMsgPosition(force->_seqId[id], Common::Point(posX, posY));
+ _scene->_sequences.setPosition(force->_seqId[id], Common::Point(posX, posY));
_scene->_sequences.setMotion(force->_seqId[id], 2, speedX, speedY);
_scene->_sequences.addSubEntry(force->_seqId[id], SEQUENCE_TRIGGER_EXPIRE, 0, 150 + id);
if (spriteId == 2)
@@ -742,7 +742,7 @@ void Scene307::enter() {
initForceField(&_forceField, true);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
_animationMode = 0;
@@ -810,7 +810,7 @@ void Scene307::enter() {
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
}
@@ -973,7 +973,7 @@ void Scene307::actions() {
_vm->_sound->command(26);
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
_scene->_sequences.addTimer(90, 5);
break;
@@ -1017,7 +1017,7 @@ void Scene307::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 60, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 3, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 18, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], -1, 4);
@@ -1028,7 +1028,7 @@ void Scene307::actions() {
case 1:
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
break;
@@ -1045,31 +1045,31 @@ void Scene307::actions() {
case 3:
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1);
_globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 11);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
_scene->_sequences.addTimer(48, 4);
break;
case 4:
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1);
_scene->_sequences.remove(_globals._sequenceIndexes[5]);
_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 12, 14);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 5);
break;
case 5:
_globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 15);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(129, 102));
_scene->_sequences.addTimer(48, 6);
break;
@@ -1077,7 +1077,7 @@ void Scene307::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[5]);
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1);
_scene->_sequences.addTimer(48, 7);
break;
@@ -1213,7 +1213,7 @@ void Scene308::enter() {
_vm->_palette->setEntry(253, 45, 15, 12);
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 9);
@@ -1354,7 +1354,7 @@ void Scene309::enter() {
_globals._spriteIndexes[4] = _scene->_sprites.addSprites(Resources::formatName(307, 'X', 0, EXT_SS, ""));
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 15);
_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0);
@@ -1543,7 +1543,7 @@ void Scene310::enter() {
_globals._spriteIndexes[3] = _scene->_sprites.addSprites(Resources::formatName(307, 'X', 0, EXT_SS, ""));
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15);
_game._player._visible = false;
@@ -1589,7 +1589,7 @@ void Scene311::enter() {
_globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RXCL_2");
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_checkGuardFl = false;
@@ -1625,7 +1625,7 @@ void Scene311::step() {
case 71:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
@@ -1643,7 +1643,7 @@ void Scene311::step() {
case 73:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
@@ -1679,7 +1679,7 @@ void Scene311::step() {
case 77:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
@@ -1691,7 +1691,7 @@ void Scene311::step() {
case 78:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
@@ -1749,7 +1749,7 @@ void Scene311::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 50, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 3, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 15, 1, 0, 0);
@@ -1762,7 +1762,7 @@ void Scene311::actions() {
case 1: {
int oldIdx = _globals._sequenceIndexes[1];
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[1], oldIdx);
}
@@ -1781,13 +1781,13 @@ void Scene311::actions() {
case 3: {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 11);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(15, 4);
}
@@ -1796,14 +1796,14 @@ void Scene311::actions() {
case 4:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 12, 14);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 5);
break;
@@ -1811,7 +1811,7 @@ void Scene311::actions() {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 15);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(15, 6);
}
@@ -1821,7 +1821,7 @@ void Scene311::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.addTimer(15, 7);
break;
@@ -2443,7 +2443,7 @@ void Scene318::handleDialog() {
int synxIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], synxIdx);
_vm->_sound->command(3);
_scene->_userInterface.setup(kInputLimitedSentences);
@@ -2514,7 +2514,7 @@ void Scene318::handleDialog() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2658,7 +2658,7 @@ void Scene318::enter() {
} else
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
}
}
@@ -2839,7 +2839,7 @@ void Scene318::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 80);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
}
@@ -2855,7 +2855,7 @@ void Scene318::actions() {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 8);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
}
break;
@@ -2874,7 +2874,7 @@ void Scene318::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 2, 0, 80);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 2, 5);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 5, 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2894,7 +2894,7 @@ void Scene318::actions() {
int oldIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], oldIdx);
_scene->_sequences.addTimer(60, 3);
}
@@ -3743,7 +3743,7 @@ void Scene320::actions() {
handleButtons();
_globals._sequenceIndexes[18] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[18], _flippedFl, 4, 2, 0, 0);
_scene->_sequences.setScale(_globals._sequenceIndexes[18], 60);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[18], Common::Point(_posX, 170));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[18], Common::Point(_posX, 170));
_scene->_sequences.setDepth(_globals._sequenceIndexes[18], 0);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[18], SEQUENCE_TRIGGER_LOOP, 0, 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[18], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -4792,7 +4792,7 @@ void Scene357::enter() {
_globals[kAfterHavoc] = true;
_globals._spriteIndexes[1] = _scene->_sprites.addSprites(Resources::formatName(307, 'X', 0, EXT_SS, ""));
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
if (_scene->_priorSceneId == 318)
@@ -4858,7 +4858,7 @@ void Scene358::setup() {
void Scene358::enter() {
_globals._spriteIndexes[1] = _scene->_sprites.addSprites(Resources::formatName(307, 'X', 0, EXT_SS, ""));
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
if (_scene->_priorSceneId == 357)
@@ -4928,7 +4928,7 @@ void Scene359::enter() {
_globals._spriteIndexes[4] = _scene->_sprites.addSprites("*ROXBD_2");
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15);
if (_game._objects.isInRoom(OBJ_SECURITY_CARD)) {
@@ -4974,7 +4974,7 @@ void Scene359::actions() {
} else {
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], true, 7, 2, 0, 0);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(106, 110));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(106, 110));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 6, 1);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
}
@@ -5057,7 +5057,7 @@ void Scene360::setup() {
void Scene360::enter() {
_globals._spriteIndexes[1] = _scene->_sprites.addSprites(Resources::formatName(307, 'X', 0, EXT_SS, ""));
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(127, 78));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
if (_scene->_priorSceneId == 359)
@@ -5119,7 +5119,7 @@ void Scene361::handleRexAction() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 50, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 3, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 15, 1, 0, 0);
@@ -5132,7 +5132,7 @@ void Scene361::handleRexAction() {
case 1: {
int seqIdx = _globals._sequenceIndexes[1];
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[1], seqIdx);
}
@@ -5151,13 +5151,13 @@ void Scene361::handleRexAction() {
case 3: {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
int seqIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 11);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], seqIdx);
_scene->_sequences.addTimer(15, 4);
}
@@ -5166,14 +5166,14 @@ void Scene361::handleRexAction() {
case 4:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.setDone(_globals._sequenceIndexes[2]);
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 12, 14);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 5);
break;
@@ -5181,7 +5181,7 @@ void Scene361::handleRexAction() {
int seqIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 15);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], seqIdx);
_scene->_sequences.addTimer(15, 6);
}
@@ -5191,7 +5191,7 @@ void Scene361::handleRexAction() {
_scene->_sequences.setDone(_globals._sequenceIndexes[2]);
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.addTimer(48, 7);
break;
@@ -5213,7 +5213,7 @@ void Scene361::handleRoxAction() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 18, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 2, 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 18, 1, 0, 0);
@@ -5226,7 +5226,7 @@ void Scene361::handleRoxAction() {
case 1: {
int tmpIdx = _globals._sequenceIndexes[1];
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[1], tmpIdx);
}
@@ -5245,14 +5245,14 @@ void Scene361::handleRoxAction() {
case 3: {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
int tmpIdx = _globals._sequenceIndexes[4];
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 9, 10);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], tmpIdx);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
}
@@ -5261,14 +5261,14 @@ void Scene361::handleRoxAction() {
case 4: {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
int tmpIdx = _globals._sequenceIndexes[4];
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 11, 15);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], tmpIdx);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 5);
}
@@ -5278,7 +5278,7 @@ void Scene361::handleRoxAction() {
int tmpIdx = _globals._sequenceIndexes[4];
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 16);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(167, 100));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], tmpIdx);
_scene->_sequences.addTimer(48, 6);
}
@@ -5289,7 +5289,7 @@ void Scene361::handleRoxAction() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.addTimer(48, 7);
break;
@@ -5313,7 +5313,7 @@ void Scene361::enter() {
_globals._spriteIndexes[4] = _scene->_sprites.addSprites("*ROXCL_8");
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
if (_scene->_priorSceneId == 391) {
@@ -5345,7 +5345,7 @@ void Scene361::step() {
case 70:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
@@ -5363,7 +5363,7 @@ void Scene361::step() {
case 72:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 3);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
@@ -5399,7 +5399,7 @@ void Scene361::step() {
case 76:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
@@ -5411,7 +5411,7 @@ void Scene361::step() {
case 77:
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(165, 76));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 15);
_scene->_sequences.setDone(_globals._sequenceIndexes[3]);
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index cb5363bd65..b1b2b098af 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -887,7 +887,7 @@ void Scene402::enter() {
if (!_game._objects.isInInventory(OBJ_REPAIR_LIST)) {
_globals._sequenceIndexes[14] = _scene->_sequences.startCycle(_globals._spriteIndexes[14], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[14], 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[14], Common::Point(210, 80));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[14], Common::Point(210, 80));
int idx = _scene->_dynamicHotspots.add(NOUN_REPAIR_LIST, 0xD1, _globals._sequenceIndexes[14], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE);
}
@@ -902,14 +902,14 @@ void Scene402::enter() {
if (!_game._objects.isInRoom(OBJ_ALIEN_LIQUOR) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP)) {
_globals._sequenceIndexes[15] = _scene->_sequences.startCycle(_globals._spriteIndexes[15], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[15], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, 0x4, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE);
}
_globals._sequenceIndexes[20] = _scene->_sequences.startCycle(_globals._spriteIndexes[20], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[20], 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
if (_globals[kBottleDisplayed]) {
_globals._sequenceIndexes[8] = _scene->_sequences.startCycle(_globals._spriteIndexes[8], false, 4);
@@ -1021,7 +1021,7 @@ void Scene402::step() {
case 21:
_globals._sequenceIndexes[15] = _scene->_sequences.startCycle(_globals._spriteIndexes[15], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[15], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
break;
default:
@@ -1106,7 +1106,7 @@ void Scene402::step() {
case 21: {
_globals._sequenceIndexes[15] = _scene->_sequences.startCycle(_globals._spriteIndexes[15], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[15], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[15], Common::Point(250, 80));
int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, 0x4, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE);
}
@@ -1678,7 +1678,7 @@ void Scene402::step() {
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 60);
_globals._sequenceIndexes[20] = _scene->_sequences.startCycle(_globals._spriteIndexes[20], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[20], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
}
break;
@@ -1937,7 +1937,7 @@ void Scene402::step() {
_globals._sequenceIndexes[20] = _scene->_sequences.startCycle(_globals._spriteIndexes[20], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[20], 8);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[20], Common::Point(234, 72));
}
if (_game._trigger == 85) {
@@ -2204,7 +2204,7 @@ void Scene402::actions() {
_game._player._visible = false;
_globals._sequenceIndexes[22] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[22], false, 7, 2, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[22], 1, 2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[22], Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[22], Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1));
_scene->_sequences.setDepth(_globals._sequenceIndexes[22], 5);
_scene->_sequences.setScale(_globals._sequenceIndexes[22], 88);
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2499,7 +2499,7 @@ void Scene405::actions() {
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 75);
Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], msgPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], msgPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[3], 87);
} else if ((_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) || _action.isAction(VERB_CLOSE, NOUN_WIDE_DOOR)) && _globals[kArmoryDoorOpen]) {
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2508,7 +2508,7 @@ void Scene405::actions() {
_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[3], 87);
} else if (_action.isAction(VERB_PUT, NOUN_CARD_SLOT)) {
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2517,7 +2517,7 @@ void Scene405::actions() {
_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[3], 87);
} else if (_action.isAction(VERB_LOOK, NOUN_CANNON_BALLS))
_vm->_dialogs->show(40510);
@@ -2707,7 +2707,7 @@ void Scene406::actions() {
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 75);
Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], msgPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], msgPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[2], 87);
} else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && _globals[kStorageDoorOpen]) {
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2717,7 +2717,7 @@ void Scene406::actions() {
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], msgPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], msgPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[2], 87);
} else if (_action.isAction(VERB_PUT, NOUN_CARD_SLOT)) {
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2726,7 +2726,7 @@ void Scene406::actions() {
_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 110);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], _game._player._playerPos);
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[2], _game._player._playerPos);
_scene->_sequences.setScale(_globals._sequenceIndexes[2], 87);
} else if (_action.isAction(VERB_LOOK, NOUN_TRASH))
_vm->_dialogs->show(40610);
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 9413350c27..1821a72c16 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -1608,20 +1608,20 @@ void Scene608::setCarAnimations() {
_scene->freeAnimation();
if (_globals[kCarStatus] == 0) {
_globals._sequenceIndexes[6] = _scene->_sequences.startCycle(_globals._spriteIndexes[6], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[6], Common::Point(143, 98));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[6], Common::Point(143, 98));
_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 6);
_globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[7], Common::Point(141, 67));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[7], Common::Point(141, 67));
_scene->_sequences.setDepth(_globals._sequenceIndexes[7], 15);
} else {
_globals._sequenceIndexes[6] = _scene->_sequences.startCycle(_globals._spriteIndexes[6], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[6], Common::Point(143, 128));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[6], Common::Point(143, 128));
_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 6);
_globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[7], Common::Point(141, 97));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[7], Common::Point(141, 97));
_scene->_sequences.setDepth(_globals._sequenceIndexes[7], 15);
_globals._sequenceIndexes[8] = _scene->_sequences.startCycle(_globals._spriteIndexes[8], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[8], Common::Point(144, 126));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[8], Common::Point(144, 126));
_scene->_sequences.setDepth(_globals._sequenceIndexes[8], 5);
}
}
@@ -2613,7 +2613,7 @@ void Scene609::step() {
if (!_globals[kHasTalkedToHermit] && (_game._difficulty != DIFFICULTY_HARD)) {
_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
_scene->_sequences.setScale(_globals._sequenceIndexes[3], 47);
}
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, -1);
@@ -2636,7 +2636,7 @@ void Scene609::step() {
if (!_globals[kHasTalkedToHermit]) {
_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
_scene->_sequences.setScale(_globals._sequenceIndexes[3], 47);
}
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 585271cfda..9383492391 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -141,7 +141,7 @@ void Scene701::enter() {
}
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
int boatStatus = (_scene->_priorSceneId == 703) ? BOAT_GONE : _globals[kBoatStatus];
@@ -182,7 +182,7 @@ void Scene701::enter() {
_game._player._visible = false;
_game._player._stepEnabled = false;
_globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
_scene->_sequences.addTimer(15, 60);
} else if (_scene->_priorSceneId == 703) {
_game._player._playerPos = Common::Point(231, 127);
@@ -207,7 +207,7 @@ void Scene701::step() {
case 60:
_scene->_sequences.remove(_globals._sequenceIndexes[5]);
_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 61);
break;
@@ -221,7 +221,7 @@ void Scene701::step() {
_vm->_sound->command(16);
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
break;
@@ -234,7 +234,7 @@ void Scene701::step() {
case 72:
_vm->_sound->command(17);
_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 73);
break;
@@ -242,7 +242,7 @@ void Scene701::step() {
case 73:
_game._player._stepEnabled = true;
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, -1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_kernelMessages.reset();
break;
@@ -285,14 +285,14 @@ void Scene701::actions() {
_game._player._stepEnabled = false;
_game._player._visible = false;
_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
break;
case 1: {
int temp = _globals._sequenceIndexes[5];
_globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[5], temp);
_scene->_sequences.addTimer(15, 2);
}
@@ -312,7 +312,7 @@ void Scene701::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_vm->_sound->command(16);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_kernelMessages.reset();
_scene->_kernelMessages.add(Common::Point(0, 0), 0x310, 34, 0, 120, _game.getQuote(0x30D));
@@ -327,14 +327,14 @@ void Scene701::actions() {
case 3:
_vm->_sound->command(17);
_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
break;
case 4:
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, -1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_globals[kResurrectRoom] = 701;
_scene->_nextSceneId = 605;
@@ -1221,10 +1221,10 @@ void Scene704::enter() {
_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
if (_scene->_priorSceneId == 705) {
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(123, 125));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(123, 125));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
} else {
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(190, 122));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(190, 122));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
}
int idx = _scene->_dynamicHotspots.add(NOUN_BONES, 0xD1, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
@@ -1250,7 +1250,7 @@ void Scene704::enter() {
_scene->_activeAnimation->setCurrentFrame(8);
} else if (_boatDirection == 2) {
if (_game._objects[OBJ_BOTTLE]._roomNumber == _scene->_currentSceneId) {
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(123, 125));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(123, 125));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
}
_scene->loadAnimation(formAnimName('A', -1));
@@ -1812,7 +1812,7 @@ void Scene706::handleTakeVase() {
if (_vaseMode == 1) {
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
int idx = _scene->_dynamicHotspots.add(NOUN_BOTTLE, VERB_WALKTO, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(175, 124), FACING_SOUTHEAST);
_game._objects.setRoom(OBJ_BOTTLE, _scene->_currentSceneId);
@@ -1844,7 +1844,7 @@ void Scene706::enter() {
} else if (_game._objects.isInRoom(OBJ_BOTTLE)) {
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
int idx = _scene->_dynamicHotspots.add(NOUN_BOTTLE, VERB_WALKTO, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(175, 124), FACING_SOUTHEAST);
}
@@ -1918,7 +1918,7 @@ void Scene706::step() {
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 4);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(195, 99));
int idx = _scene->_dynamicHotspots.add(NOUN_BOTTLE, VERB_WALKTO, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(175, 124), FACING_SOUTHEAST);
}
@@ -2199,7 +2199,7 @@ void Scene751::enter() {
}
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
if (_scene->_priorSceneId == 752) {
@@ -2211,7 +2211,7 @@ void Scene751::enter() {
_game._player._visible = false;
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
_scene->_sequences.addTimer(15, 70);
} else if (_scene->_priorSceneId != -2) {
_game._player._playerPos = Common::Point(22, 131);
@@ -2249,7 +2249,7 @@ void Scene751::step() {
case 70:
_scene->_sequences.remove(_globals._sequenceIndexes[4]);
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
break;
@@ -2275,7 +2275,7 @@ void Scene751::step() {
_vm->_sound->command(16);
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 61);
break;
@@ -2288,14 +2288,14 @@ void Scene751::step() {
case 62:
_vm->_sound->command(17);
_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
break;
case 63:
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, -1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_game._player._stepEnabled = true;
_scene->_kernelMessages.reset();
@@ -2357,14 +2357,14 @@ void Scene751::actions() {
_game._player._stepEnabled = false;
_game._player._visible = false;
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
break;
case 1: {
int syncIdx = _globals._sequenceIndexes[4];
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, -2);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], syncIdx);
_scene->_sequences.addTimer(15, 2);
}
@@ -2384,7 +2384,7 @@ void Scene751::actions() {
_scene->_sequences.remove(_globals._sequenceIndexes[1]);
_vm->_sound->command(16);
_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_kernelMessages.reset();
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x30D));
@@ -2399,14 +2399,14 @@ void Scene751::actions() {
case 3:
_vm->_sound->command(17);
_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
break;
case 4:
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, -1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
_scene->_sequences.addTimer(60, 5);
break;
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 6f9a46d655..c0f24a78fc 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -911,7 +911,7 @@ void Scene804::enter() {
_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(133, 139));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(133, 139));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8);
}
@@ -931,7 +931,7 @@ void Scene804::step() {
if ((_throttleGone) && (_movingThrottle) && (_scene->_activeAnimation->getCurrentFrame() == 39)) {
_globals._sequenceIndexes[1] = _scene->_sequences.startCycle
(_globals._spriteIndexes[1], false, 1);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(133, 139));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(133, 139));
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8);
_throttleGone = false;
}
@@ -1329,7 +1329,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
break;
@@ -1343,7 +1343,7 @@ void Scene808::actions() {
_vm->_sound->command(25);
}
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
break;
@@ -1365,7 +1365,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
break;
@@ -1378,7 +1378,7 @@ void Scene808::actions() {
}
_globals[kTopButtonPushed] = false;
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
break;
@@ -1395,7 +1395,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
break;
@@ -1409,7 +1409,7 @@ void Scene808::actions() {
}
_globals[kTopButtonPushed] = true;
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
break;
@@ -1426,7 +1426,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(168, 211));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(168, 211));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
break;
@@ -1443,7 +1443,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(172, 163));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(172, 163));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
break;
@@ -1460,7 +1460,7 @@ void Scene808::actions() {
case 0:
_game._player._stepEnabled = false;
_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
- _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[4], Common::Point(172, 186));
+ _scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(172, 186));
_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
break;
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index a7c6dedb12..e0efc7cf03 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -123,8 +123,8 @@ int SequenceList::add(int spriteListIndex, bool flipped, int frameIndex, int tri
_entries[seqIndex]._depth = depth;
_entries[seqIndex]._scale = scale;
_entries[seqIndex]._nonFixed = nonFixed;
- _entries[seqIndex]._msgPos.x = msgX;
- _entries[seqIndex]._msgPos.y = msgY;
+ _entries[seqIndex]._position.x = msgX;
+ _entries[seqIndex]._position.y = msgY;
_entries[seqIndex]._numTicks = numTicks;
_entries[seqIndex]._extraTicks = extraTicks;
@@ -192,7 +192,7 @@ void SequenceList::setSpriteSlot(int seqIndex, SpriteSlot &spriteSlot) {
spriteSlot._scale = timerEntry._scale;
if (!timerEntry._nonFixed) {
- spriteSlot._position = timerEntry._msgPos;
+ spriteSlot._position = timerEntry._position;
} else {
MSprite *sprite = spriteSet.getFrame(timerEntry._frameIndex - 1);
spriteSlot._position = sprite->_offset;
@@ -231,14 +231,14 @@ bool SequenceList::loadSprites(int seqIndex) {
seqEntry._field20 += seqEntry._field18;
if (seqEntry._field20 >= 100) {
int v = seqEntry._field20 / 100;
- seqEntry._msgPos.x += v * seqEntry._field1C;
+ seqEntry._position.x += v * seqEntry._field1C;
seqEntry._field20 -= v * 100;
}
seqEntry._field22 += seqEntry._field1A;
if (seqEntry._field22 >= 100) {
int v = seqEntry._field22 / 100;
- seqEntry._msgPos.y += v * seqEntry._field1E;
+ seqEntry._position.y += v * seqEntry._field1E;
seqEntry._field22 -= v * 100;
}
}
@@ -424,8 +424,8 @@ void SequenceList::setDepth(int seqIndex, int depth) {
_entries[seqIndex]._depth = depth;
}
-void SequenceList::setMsgPosition(int seqIndex, const Common::Point &pt) {
- _entries[seqIndex]._msgPos = pt;
+void SequenceList::setPosition(int seqIndex, const Common::Point &pt) {
+ _entries[seqIndex]._position = pt;
_entries[seqIndex]._nonFixed = false;
}
@@ -497,7 +497,7 @@ void SequenceList::setScale(int spriteIdx, int scale) {
void SequenceList::setMsgLayout(int seqIndex) {
Player &player = _vm->_game->_player;
int yp = player._playerPos.y + (player._centerOfGravity * player._currentScale) / 100;
- setMsgPosition(seqIndex, Common::Point(player._playerPos.x, yp));
+ setPosition(seqIndex, Common::Point(player._playerPos.x, yp));
setDepth(seqIndex, player._currentDepth);
setScale(seqIndex, player._currentScale);
updateTimeout(-1, seqIndex);
@@ -508,4 +508,11 @@ void SequenceList::setDone(int seqIndex) {
_entries[seqIndex]._timeout = _vm->_game->_player._priorTimer;
}
+void SequenceList::setMotion(int seqIndex, int flags, int deltaX, int deltaY) {
+ warning("TODO: setMotion()");
+ // HACK: Just offset by the delta for now
+ _entries[seqIndex]._position.x += deltaX;
+ _entries[seqIndex]._position.y += deltaY;
+}
+
} // End of namespace
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index b23f595e74..71460ea4f6 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -68,7 +68,7 @@ struct SequenceEntry {
bool _nonFixed;
uint32 _flags;
- Common::Point _msgPos;
+ Common::Point _position;
int _field18;
int _field1A;
int _field1C;
@@ -113,7 +113,7 @@ public:
void setAnimRange(int seqIndex, int startVal, int endVal);
void scan();
void setDepth(int seqIndex, int depth);
- void setMsgPosition(int seqIndex, const Common::Point &pt);
+ void setPosition(int seqIndex, const Common::Point &pt);
int addSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks,
int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
int addReverseSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks,
@@ -126,12 +126,7 @@ public:
void setScale(int spriteIdx, int scale);
void setMsgLayout(int seqIndex);
void setDone(int seqIndex);
- void setMotion(int seqIndex, int flags, int deltaX, int deltaY) {
- warning("TODO: setMotion()");
- // HACK: Just offset by the delta for now
- _entries[seqIndex]._msgPos.x += deltaX;
- _entries[seqIndex]._msgPos.y += deltaY;
- }
+ void setMotion(int seqIndex, int flags, int deltaX, int deltaY);
};
} // End of namespace MADS
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 16:34:19 +0000