AVALANCHE: Change _logger into pointer, update everything accordingly.

6 files changed, 8 insertions, 7 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 0b522b151c..f130089102 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -62,6 +62,7 @@ AvalancheEngine::~AvalancheEngine() {
 	delete _gyro;
 	delete _enhanced;
 	delete _timeout;
+	delete _logger;
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {
@@ -70,7 +71,7 @@ Common::ErrorCode AvalancheEngine::initialize() {
 	_avalot = new Avalot(this);
 	_gyro = new Gyro(this);
 	_enhanced = new Enhanced(this);
-	_logger.setParent(this);
+	_logger = new Logger(this);
 	_pingo.setParent(this);
 	_scrolls.setParent(this);
 	_visa.setParent(this);
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 4af8a82edd..76873a5af2 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -70,7 +70,7 @@ public:
 	Avalot *_avalot;
 	Gyro *_gyro;
 	Enhanced *_enhanced;
-	Logger _logger;
+	Logger *_logger;
 	Pingo _pingo;
 	Scrolls _scrolls;
 	Visa _visa;
diff --git a/engines/avalanche/logger2.cpp b/engines/avalanche/logger2.cpp
index 20ca558e41..ef94eb3522 100644
--- a/engines/avalanche/logger2.cpp
+++ b/engines/avalanche/logger2.cpp
@@ -75,7 +75,7 @@ const int16 Logger::divide_indent = 30;
 
 
 
-void Logger::setParent(AvalancheEngine *vm) {
+Logger::Logger(AvalancheEngine *vm) {
 	_vm = vm;
 }
 
diff --git a/engines/avalanche/logger2.h b/engines/avalanche/logger2.h
index 05a96d08ca..95e5ea849d 100644
--- a/engines/avalanche/logger2.h
+++ b/engines/avalanche/logger2.h
@@ -38,7 +38,7 @@ class AvalancheEngine;
 
 class Logger {
 public:
-	void setParent(AvalancheEngine *vm);
+	Logger(AvalancheEngine *vm);
 
 	void log_setup(Common::String name, bool printing);
 
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 59942ac95e..dd6503caf8 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -278,7 +278,7 @@ void Lucerna::load(byte n) {     /* Load2, actually */
 
 	bit = *_vm->_graphics->getPixel(0,0);
 
-	_vm->_logger.log_newroom(_vm->_gyro->roomname);
+	_vm->_logger->log_newroom(_vm->_gyro->roomname);
 
 	if (was_virtual)
 		_vm->_gyro->on_virtual();
@@ -881,7 +881,7 @@ void Lucerna::points(byte num) {     /* Add on no. of points */
 	}
 	warning("STUB: Lucerna::points()");
 
-	_vm->_logger.log_score(num, _vm->_gyro->dna.score);
+	_vm->_logger->log_score(num, _vm->_gyro->dna.score);
 	showscore();
 }
 
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index b0563c68a1..0a76168ada 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -146,7 +146,7 @@ void Scrolls::music_scroll() {
 void Scrolls::resetscrolldriver() {   /* phew */
 	_vm->_gyro->scrollbells = 0;
 	cfont = roman;
-	_vm->_logger.log_epsonroman();
+	_vm->_logger->log_epsonroman();
 	use_icon = 0;
 	_vm->_gyro->interrogation = 0; /* always reset after a scroll comes up. */
 }