AVALANCHE: Partially implement the music room. (Without music.)

2 files changed, 25 insertions, 8 deletions

diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 8019a35312..88c928cbea 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -244,7 +244,28 @@ bool Scrolls::they_match(tunetype &played) {
 }
 
 void Scrolls::music_scroll() {
+	state(3);
+	_vm->_gyro->seescroll = true;
+	_vm->_gyro->on();
+	_vm->_gyro->newpointer(4);
+
+	// Since there are no sounds in the game yet, it's pretty pointless to implement this function further. 
+	// For now we act like the player just played the right tone.
+	//if (they_match(played)) {
+		_vm->_gyro->screturn = true;
+		_vm->_gyro->off();
+		state(0);
+		_vm->_gyro->seescroll = false;
+
+		_vm->_timeout->set_up_timer(8, _vm->_timeout->procjacques_wakes_up, _vm->_timeout->reason_jacques_waking_up);
+		return;
+	//}
 	warning("STUB: Scrolls::music_scroll()");
+
+	_vm->_gyro->screturn = false;
+	_vm->_gyro->off();
+	state(0);
+	_vm->_gyro->seescroll = false;
 }
 
 /* ThatsAll, so put us back to */ /*$F-*/
@@ -861,19 +882,15 @@ void Scrolls::okay() {
 }
 
 void Scrolls::musical_scroll() {
-	bool was_virtual;
-
-	display(Common::String("To play the harp...\r\rUse these keys:\r\n") +
-	        "Q W E R T Y U I O P [ ]\r\rOr press Enter to stop playing.\4");
+	display(Common::String("To play the harp...") + kControlNewLine + kControlNewLine + "Use these keys:" + + kControlNewLine
+		+ kControlInsertSpaces + "Q W E R T Y U I O P [ ]" + kControlNewLine + kControlNewLine + "Or press Enter to stop playing."
+		+ kControlToBuffer);
 
 	_vm->_lucerna->sprite_run();
 
-	was_virtual = _vm->_gyro->visible == _vm->_gyro->m_virtual;
-
 	drawscroll(&Avalanche::Scrolls::music_scroll);
 
 	resetscroll();
 }
 
-
 } // End of namespace Avalanche
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 5c786ce3e8..5b0f285811 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -405,7 +405,7 @@ void Timeout::jacques_wakes_up() {
 	case 2 : /* Going through the door. */
 		_vm->_celer->show_one(2); /* Not on the floor. */
 		_vm->_celer->show_one(3); /* But going through the door. */
-		_vm->_gyro->magics[6].op = _vm->_gyro->nix; /* You can't wake him up now. */
+		_vm->_gyro->magics[5].op = _vm->_gyro->nix; /* You can't wake him up now. */
 		break;
 	case 3 :  /* Gone through the door. */
 		_vm->_celer->show_one(2); /* Not on the floor, either. */