From 832a11a2bad40b8330fe9bd0a9f6c7cdb871e670 Mon Sep 17 00:00:00 2001
From: uruk
Date: Fri, 2 Aug 2013 14:15:36 +0200
Subject: AVALANCHE: Repair Scrolls::resetscroll() and Scrolls::calldrivers().

---
 engines/avalanche/avalot.cpp   |  6 ++++--
 engines/avalanche/scrolls2.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index bdf74728c1..c403f00a3d 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -147,8 +147,10 @@ void Avalot::setup() {
 	_vm->_parser->cursorOn();
 	_vm->_trip->newspeed();
 
-	if (! _vm->_gyro->reloaded)
-		_vm->_visa->dixi('q', 83); /* Info on the game: etc. */
+	//if (! _vm->_gyro->reloaded)
+	//	_vm->_visa->dixi('q', 83); /* Info on the game: etc. */
+	//
+	// TODO: UNCOMMENT THIS! ONLY COMMENTED OUT FOR TESTING!!!
 }
 
 
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 1f85ba0eb1..4c3ebc0d68 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -237,10 +237,10 @@ bool Scrolls::ask(Common::String question) {
 }
 
 void Scrolls::resetscroll() {
-	_vm->_gyro->scrolln = 1;
+	_vm->_gyro->scrolln = 0;
 	for (int j = 0; j < 15; j ++)
-		for (int i = 0; i < _vm->_gyro->scroll[j].size(); i++)
-			_vm->_gyro->scroll[j].setChar(0, i);
+		if (!_vm->_gyro->scroll[j].empty())
+			_vm->_gyro->scroll[j].clear();
 }
 
 void Scrolls::natural() {   /* Natural state of bubbles */
@@ -496,12 +496,12 @@ void Scrolls::calldrivers() {
 					solidify(_vm->_gyro->scrolln);
 					_vm->_gyro->scrolln++;
 				}
-				_vm->_gyro->scroll[_vm->_gyro->scrolln] = _vm->_gyro->scroll[_vm->_gyro->scrolln] + _vm->_gyro->buffer[fv];
+				_vm->_gyro->scroll[_vm->_gyro->scrolln] += _vm->_gyro->buffer[fv];
 				}
 			}
 }
 
-void Scrolls::display(Common::String z) {
+void Scrolls::display(Common::String z) { // TODO: REPLACE BUFFER WITH A STRING!!!!!!!!!!
 	_vm->_gyro->bufsize = z.size();
 	memcpy(_vm->_gyro->buffer, z.c_str(), _vm->_gyro->bufsize);
 	calldrivers();
-- 
cgit v1.2.3