AVALANCHE: Implement Acci::exampers(). Repair Avalot::setup().

3 files changed, 23 insertions, 7 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 2ee878d91f..8a194ebd2d 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -655,7 +655,27 @@ bool Acci::personshere() { // Person equivalent of "holding".
 }
 
 void Acci::exampers() {
-	warning("STUB: Acci::exampers()");
+	if (personshere()) {
+		if (thing != _vm->_gyro->thinks)
+			_vm->_lucerna->thinkabout(person, _vm->_gyro->a_person);
+		person -= 149;
+		switch (person) { /* Special cases */
+		case 11:
+			if (_vm->_gyro->dna.wonnim)
+				_vm->_visa->dixi('Q', 8); // "I'm Not Playing!"
+			return;
+		case 99:
+			if (_vm->_gyro->dna.lustie_is_asleep)
+				_vm->_visa->dixi('Q', 65); // He's asleep. (65! Wow!)
+			return;
+		}
+		// Otherwise...
+		_vm->_visa->dixi('p', person);
+	} 
+	
+	// And afterwards...
+	if ((person == 14) && (!_vm->_gyro->dna.ayles_is_awake))
+		_vm->_visa->dixi('Q', 13);
 }
 
 bool Acci::holding() {
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 95f564e011..de37f504fa 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -195,12 +195,8 @@ void Avalot::setup() {
 	int16 loadSlot = Common::ConfigManager::instance().getInt("save_slot");
 	if (loadSlot >= 0) {		
 		_vm->loadGame(loadSlot);
-	} else
+	} else {
 		_vm->_gyro->isLoaded = false; // Set to true in _vm->loadGame().
-
-
-
-	if (!_vm->_gyro->isLoaded) {
 		_vm->_gyro->newgame(); // No game was requested- load the default.
 
 		_vm->_gyro->soundfx = ! _vm->_gyro->soundfx;
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 825d40f161..ec78028fcf 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -500,7 +500,7 @@ public:
 	bool lmo, mousemade;
 	Common::String scroll[15];
 	byte scrolln, score, whichwas;
-	char thinks;
+	byte thinks;
 	bool thinkthing;
 
 	/* pp:array[1..1000] of postype;