MADS: Phantom: Implement scene 407

3 files changed, 488 insertions, 1 deletions

diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp
index e46374384a..e117a92015 100644
--- a/engines/mads/phantom/phantom_scenes.cpp
+++ b/engines/mads/phantom/phantom_scenes.cpp
@@ -128,7 +128,7 @@ SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
 	case 406:	// labyrinth room, 2 exits
 		return new Scene406(vm);
 	case 407:	// catacomb room / lake
-		return new DummyScene(vm);	// TODO
+		return new Scene407(vm);
 	case 408:	// catacomb corridor
 		return new DummyScene(vm);	// TODO
 	case 409:	// catacomb room, door with switch panel
diff --git a/engines/mads/phantom/phantom_scenes4.cpp b/engines/mads/phantom/phantom_scenes4.cpp
index 755a5cbcfa..ef3d1a0d32 100644
--- a/engines/mads/phantom/phantom_scenes4.cpp
+++ b/engines/mads/phantom/phantom_scenes4.cpp
@@ -1958,5 +1958,471 @@ void Scene406::preActions() {
 
 /*------------------------------------------------------------------------*/
 
+Scene407::Scene407(MADSEngine *vm) : Scene4xx(vm) {
+	_frameInRoomFl = false;
+	_takingFrameInRoomFl = false;
+
+	_redFrameHotspotId = -1;
+	_greenFrameHotspotId = -1;
+	_blueFrameHotspotId = -1;
+	_yellowFrameHotspotId = -1;
+}
+
+void Scene407::synchronize(Common::Serializer &s) {
+	Scene4xx::synchronize(s);
+
+	s.syncAsByte(_frameInRoomFl);
+	s.syncAsByte(_takingFrameInRoomFl);
+
+	s.syncAsSint16LE(_redFrameHotspotId);
+	s.syncAsSint16LE(_greenFrameHotspotId);
+	s.syncAsSint16LE(_blueFrameHotspotId);
+	s.syncAsSint16LE(_yellowFrameHotspotId);
+}
+
+void Scene407::setup() {
+	setPlayerSpritesPrefix();
+	setAAName();
+
+	_scene->addActiveVocab(NOUN_RED_FRAME);
+	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
+	_scene->addActiveVocab(NOUN_BLUE_FRAME);
+	_scene->addActiveVocab(NOUN_GREEN_FRAME);
+}
+
+void Scene407::enter() {
+	_game.initCatacombs();
+
+	_globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9", false);
+	_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0), false);
+	_globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 1), false);
+	_globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 2), false);
+	_globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 3), false);
+
+	if (_game.exitCatacombs(3) == -1) {
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(9, 46));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(8, 138));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(12, 149));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(0, 151));
+	}
+
+	if (_game.exitCatacombs(1) == -1) {
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(310, 107));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(308, 175));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(308, 146));
+		_scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(309, 152));
+	}
+
+	if (_scene->_priorSceneId != RETURNING_FROM_LOADING) {
+		switch (_globals[kCatacombsFrom]) {
+		case 0:
+			_game._player._playerPos = Common::Point(197, 14);
+			_game._player._facing = FACING_WEST;
+			_game._player.walk(Common::Point(181, 14), FACING_WEST);
+			break;
+
+		case 1:
+			_game._player.firstWalk(Common::Point(330, 146), FACING_WEST, Common::Point(298, 146), FACING_WEST, true);
+			break;
+
+		case 2:
+			_game._player._playerPos = Common::Point(147, 14);
+			_game._player._facing = FACING_EAST;
+			_game._player.walk(Common::Point(165, 14), FACING_EAST);
+			break;
+
+		case 3:
+			_game._player.firstWalk(Common::Point(-20, 143), FACING_WEST, Common::Point(20, 143), FACING_WEST, true);
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	if (_game._objects[OBJ_RED_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1);
+		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
+
+		Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+		_redFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_RED_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+		_scene->_dynamicHotspots.setPosition(_redFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+	}
+
+	if (_game._objects[OBJ_GREEN_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1);
+		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14);
+
+		Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+		_greenFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_GREEN_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+		_scene->_dynamicHotspots.setPosition(_greenFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+	}
+
+	if (_game._objects[OBJ_BLUE_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, 1);
+		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14);
+
+		Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+		_blueFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_BLUE_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+		_scene->_dynamicHotspots.setPosition(_blueFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+	}
+
+	if (_game._objects[OBJ_YELLOW_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, 1);
+		_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 14);
+
+		Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+		_yellowFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_YELLOW_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+		_scene->_dynamicHotspots.setPosition(_yellowFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+	}
+
+	sceneEntrySound();
+}
+
+void Scene407::step() {
+}
+
+void Scene407::actions() {
+	if (_action.isAction(VERB_WALK_TO, NOUN_WALL) && (_game._player._playerPos.y > 30) && (_scene->_customDest.x > 160) && (_scene->_customDest.x < 190)) {
+		_vm->_dialogs->show(40718);
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_WALK_TO) && (_scene->_customDest.x < 130) && (_game._player._playerPos.y < 30)) {
+		_vm->_dialogs->show(40718);
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_WALK_TO) && (_scene->_customDest.x > 203) && (_game._player._playerPos.y < 30)) {
+		_vm->_dialogs->show(40718);
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_WALK_TO, NOUN_FLOOR)) {
+		if ((_game._player._playerPos.y < 30) && (_scene->_customDest.y > 29)) {
+			_vm->_dialogs->show(40718);
+			_action._inProgress = false;
+			return;
+		} else if ((_game._player._playerPos.y > 29) && (_scene->_customDest.y < 30)) {
+			_vm->_dialogs->show(40718);
+			_action._inProgress = false;
+			return;
+		}
+	}
+
+	if (_action.isAction(VERB_PUT) && _action.isTarget(NOUN_FLOOR)) {
+		if (_action.isObject(NOUN_RED_FRAME) || _action.isObject(NOUN_BLUE_FRAME) || _action.isObject(NOUN_YELLOW_FRAME) || _action.isObject(NOUN_GREEN_FRAME)) {
+			if ((_game._player._playerPos.y < 30) && (_scene->_customDest.y < 30))
+				_vm->_dialogs->show(40717);
+			else if ((_game._player._playerPos.y < 30) && (_scene->_customDest.y > 29))
+				_vm->_dialogs->show(40718);
+			else if (_frameInRoomFl)
+				_vm->_dialogs->show(29);
+			else {
+				switch (_game._trigger) {
+				case (0):
+					_game._player._stepEnabled = false;
+					_game._player._visible = false;
+					_globals._sequenceIndexes[0] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[0], true, 5, 2);
+					_scene->_sequences.setAnimRange(_globals._sequenceIndexes[0], 1, 5);
+					_scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], true);
+					_scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 2, 5, 1);
+					_scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 0, 0, 2);
+					break;
+
+				case 1:
+					if (_action.isObject(NOUN_RED_FRAME)) {
+						_game._objects.setRoom(OBJ_RED_FRAME, NOWHERE);
+						_game._objects[OBJ_RED_FRAME]._roomNumber = _globals[kCatacombsRoom] + 600;
+						_globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1);
+						_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
+
+						Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+						_redFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_RED_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+						_scene->_dynamicHotspots.setPosition(_redFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+					}
+
+					if (_action.isObject(NOUN_GREEN_FRAME)) {
+						_game._objects.setRoom(OBJ_GREEN_FRAME, NOWHERE);
+						_game._objects[OBJ_GREEN_FRAME]._roomNumber = _globals[kCatacombsRoom] + 600;
+						_globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1);
+						_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14);
+
+						Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+						_greenFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_GREEN_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+						_scene->_dynamicHotspots.setPosition(_greenFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+					}
+
+					if (_action.isObject(NOUN_BLUE_FRAME)) {
+						_game._objects.setRoom(OBJ_BLUE_FRAME, NOWHERE);
+						_game._objects[OBJ_BLUE_FRAME]._roomNumber = _globals[kCatacombsRoom] + 600;
+						_globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, 1);
+						_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14);
+
+						Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+						_blueFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_BLUE_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+						_scene->_dynamicHotspots.setPosition(_blueFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+					}
+
+					if (_action.isObject(NOUN_YELLOW_FRAME)) {
+						_game._objects.setRoom(OBJ_YELLOW_FRAME, NOWHERE);
+						_game._objects[OBJ_YELLOW_FRAME]._roomNumber = _globals[kCatacombsRoom] + 600;
+						_globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, 1);
+						_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 14);
+
+						Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+						_yellowFrameHotspotId = _scene->_dynamicHotspots.add(NOUN_YELLOW_FRAME, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(pos.x - 5, pos.y - 5, pos.x + 5, pos.y + 1));
+						_scene->_dynamicHotspots.setPosition(_yellowFrameHotspotId, Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+					}
+					break;
+
+				case 2:
+					_game.syncTimers(2, 0, 1, _globals._sequenceIndexes[0]);
+					_game._player._visible = true;
+					_game._player._stepEnabled = true;
+					break;
+
+				default:
+					break;
+				}
+			}
+			_action._inProgress = false;
+			return;
+		}
+	}
+
+	if (_action.isAction(VERB_TAKE)) {
+		if (_action.isObject(NOUN_RED_FRAME) || _action.isObject(NOUN_GREEN_FRAME) || _action.isObject(NOUN_BLUE_FRAME) || _action.isObject(NOUN_YELLOW_FRAME)) {
+			if ((_takingFrameInRoomFl || _game._trigger)) {
+				if (_game._player._playerPos.y < 30)
+					_vm->_dialogs->show(40718);
+				else {
+					switch (_game._trigger) {
+					case (0):
+						_game._player._stepEnabled = false;
+						_game._player._visible = false;
+						_globals._sequenceIndexes[0] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[0], true, 5, 2);
+						_scene->_sequences.setAnimRange(_globals._sequenceIndexes[0], 1, 5);
+						_scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], true);
+						_scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 2, 5, 1);
+						_scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 0, 0, 2);
+						break;
+
+					case 1:
+						if (_action.isObject(NOUN_RED_FRAME)) {
+							_scene->deleteSequence(_globals._sequenceIndexes[1]);
+							_scene->_dynamicHotspots.remove(_redFrameHotspotId);
+							_game._objects.addToInventory(OBJ_RED_FRAME);
+						}
+
+						if (_action.isObject(NOUN_GREEN_FRAME)) {
+							_scene->deleteSequence(_globals._sequenceIndexes[2]);
+							_scene->_dynamicHotspots.remove(_greenFrameHotspotId);
+							_game._objects.addToInventory(OBJ_GREEN_FRAME);
+						}
+
+						if (_action.isObject(NOUN_BLUE_FRAME)) {
+							_scene->deleteSequence(_globals._sequenceIndexes[3]);
+							_scene->_dynamicHotspots.remove(_blueFrameHotspotId);
+							_game._objects.addToInventory(OBJ_BLUE_FRAME);
+						}
+
+						if (_action.isObject(NOUN_YELLOW_FRAME)) {
+							_scene->deleteSequence(_globals._sequenceIndexes[4]);
+							_scene->_dynamicHotspots.remove(_yellowFrameHotspotId);
+							_game._objects.addToInventory(OBJ_YELLOW_FRAME);
+						}
+
+						_vm->_sound->command(26);
+						break;
+
+					case 2:
+						_game.syncTimers(2, 0, 1, _globals._sequenceIndexes[0]);
+						_game._player._visible = true;
+						_game._player._stepEnabled = true;
+						break;
+
+					default:
+						break;
+					}
+				}
+				_action._inProgress = false;
+				return;
+			}
+		}
+	}
+
+	if (_action.isAction(VERB_WALK_THROUGH, NOUN_ARCHWAY_TO_WEST)) {
+		if (_game._player._playerPos.y < 30)
+			_game.moveCatacombs(2);
+		else
+			_vm->_dialogs->show(40718);
+
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_WALK_THROUGH, NOUN_ARCHWAY_TO_EAST)) {
+		if (_game._player._playerPos.y < 30)
+			_game.moveCatacombs(0);
+		else
+			_vm->_dialogs->show(40718);
+
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_EXIT_TO, NOUN_MORE_CATACOMBS) && (_game._player._playerPos.y < 30)) {
+		_vm->_dialogs->show(40718);
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action._lookFlag) {
+		_vm->_dialogs->show(40710);
+		_action._inProgress = false;
+		return;
+	}
+
+	if (_action.isAction(VERB_LOOK) || _action.isAction(VERB_LOOK_AT)) {
+		if (_action.isObject(NOUN_WALL)) {
+			_vm->_dialogs->show(40711);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_FLOOR)) {
+			_vm->_dialogs->show(40712);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_ARCHWAY)) {
+			_vm->_dialogs->show(40713);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_MORE_CATACOMBS)) {
+			_vm->_dialogs->show(40714);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_COLUMN)) {
+			_vm->_dialogs->show(40715);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_RED_FRAME) && !_game._objects.isInInventory(OBJ_RED_FRAME)) {
+			_vm->_dialogs->showItem(OBJ_RED_FRAME, 802, 0);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_GREEN_FRAME) && !_game._objects.isInInventory(OBJ_GREEN_FRAME)) {
+			_vm->_dialogs->showItem(OBJ_GREEN_FRAME, 818, 0);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_BLUE_FRAME) && !_game._objects.isInInventory(OBJ_BLUE_FRAME)) {
+			_vm->_dialogs->showItem(OBJ_BLUE_FRAME, 817, 0);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_YELLOW_FRAME) && !_game._objects.isInInventory(OBJ_YELLOW_FRAME)) {
+			_vm->_dialogs->showItem(OBJ_YELLOW_FRAME, 804, 0);
+			_action._inProgress = false;
+			return;
+		}
+
+		if (_action.isObject(NOUN_LAKE)) {
+			_vm->_dialogs->show(40716);
+			_action._inProgress = false;
+		}
+	}
+}
+
+void Scene407::preActions() {
+	if (_action.isAction(VERB_EXIT_TO, NOUN_MORE_CATACOMBS)) {
+		if (_game._player._playerPos.y > 30) {
+			if (_scene->_customDest.x < 100)
+				_game.moveCatacombs(3);
+			else
+				_game.moveCatacombs(1);
+		} else
+			_game._player._needToWalk = false;
+	}
+
+	if (_action.isAction(VERB_WALK_THROUGH) && (_game._player._playerPos.y > 30))
+		_game._player._needToWalk = false;
+
+	_frameInRoomFl = false;
+	_takingFrameInRoomFl = false;
+
+	if (_game._objects[OBJ_RED_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_frameInRoomFl = true;
+		if (_action.isAction(VERB_TAKE, NOUN_RED_FRAME))
+			_takingFrameInRoomFl = true;
+	}
+
+	if (_game._objects[OBJ_YELLOW_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_frameInRoomFl = true;
+		if (_action.isAction(VERB_TAKE, NOUN_YELLOW_FRAME))
+			_takingFrameInRoomFl = true;
+	}
+
+	if (_game._objects[OBJ_BLUE_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_frameInRoomFl = true;
+		if (_action.isAction(VERB_TAKE, NOUN_BLUE_FRAME))
+			_takingFrameInRoomFl = true;
+	}
+
+	if (_game._objects[OBJ_GREEN_FRAME]._roomNumber == _globals[kCatacombsRoom] + 600) {
+		_frameInRoomFl = true;
+		if (_action.isAction(VERB_TAKE, NOUN_GREEN_FRAME))
+			_takingFrameInRoomFl = true;
+	}
+
+	if (_action.isAction(VERB_PUT) && _action.isTarget(NOUN_FLOOR)
+	 && (_action.isObject(NOUN_RED_FRAME) || _action.isObject(NOUN_BLUE_FRAME) || _action.isObject(NOUN_YELLOW_FRAME) || _action.isObject(NOUN_GREEN_FRAME))) {
+		if ((_frameInRoomFl) || (_game._player._playerPos.y < 30) || (_scene->_customDest.y < 30))
+			_game._player._needToWalk = false;
+		else {
+			Common::Point pos = _scene->_sprites[_globals._spriteIndexes[1]]->getFramePos(0);
+			_game._player.walk(Common::Point(pos.x + 12, pos.y), FACING_NORTHWEST);
+		}
+	}
+
+	if (_action.isAction(VERB_TAKE)
+	 && (_action.isObject(NOUN_RED_FRAME) || _action.isObject(NOUN_GREEN_FRAME) || _action.isObject(NOUN_BLUE_FRAME) || _action.isObject(NOUN_YELLOW_FRAME))) {
+		if (_takingFrameInRoomFl && (_game._player._playerPos.y < 30))
+			_game._player._needToWalk = false;
+	}
+
+	if (_action.isAction(VERB_WALK_ACROSS, NOUN_FLOOR) && (_game._player._playerPos.y < 30) && (_scene->_customDest.y > 29))
+		_game._player._needToWalk = false;
+
+	if (_action.isAction(VERB_WALK_TO, NOUN_LAKE) && (_game._player._playerPos.y < 30))
+		_game._player.walk(Common::Point(172, 18), FACING_SOUTH);
+
+	if (_action.isAction(VERB_WALK_TO) && (_scene->_customDest.x < 130) && (_game._player._playerPos.y < 30))
+		_game._player._needToWalk = false;
+
+	if (_action.isAction(VERB_WALK_TO) && (_scene->_customDest.x > 203) && (_game._player._playerPos.y < 30))
+		_game._player._needToWalk = false;
+
+	if (_action.isAction(VERB_WALK_TO, NOUN_WALL) && (_game._player._playerPos.y > 30) && (_scene->_customDest.x > 160) && (_scene->_customDest.x < 190))
+			_game._player._needToWalk = false;
+}
+
+/*------------------------------------------------------------------------*/
+
 } // End of namespace Phantom
 } // End of namespace MADS
diff --git a/engines/mads/phantom/phantom_scenes4.h b/engines/mads/phantom/phantom_scenes4.h
index a53179cc42..a992cea574 100644
--- a/engines/mads/phantom/phantom_scenes4.h
+++ b/engines/mads/phantom/phantom_scenes4.h
@@ -138,6 +138,27 @@ public:
 	virtual void preActions();
 	virtual void actions();
 };
+
+class Scene407 : public Scene4xx {
+private:
+	bool _frameInRoomFl;
+	bool _takingFrameInRoomFl;
+
+	int _redFrameHotspotId;
+	int _greenFrameHotspotId;
+	int _blueFrameHotspotId;
+	int _yellowFrameHotspotId;
+
+public:
+	Scene407(MADSEngine *vm);
+	virtual void synchronize(Common::Serializer &s);
+
+	virtual void setup();
+	virtual void enter();
+	virtual void step();
+	virtual void preActions();
+	virtual void actions();
+};
 } // End of namespace Phantom
 } // End of namespace MADS