From 98b5fe757f2559acd90b05f20ce4425ab8c73b0f Mon Sep 17 00:00:00 2001
From: Strangerke <strangerke@scummvm.org>
Date: Mon, 30 Sep 2013 22:00:05 +0200
Subject: [PATCH] AVALANCHE: Remove various dead variables and associated code

---
 engines/avalanche/animation.cpp | 2 +-
 engines/avalanche/avalanche.cpp | 1 -
 engines/avalanche/avalanche.h   | 7 +------
 engines/avalanche/avalot.cpp    | 2 --
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 89fd16f2583..f7f103d988f 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -1091,7 +1091,7 @@ void Animation::drawSprites() {
  * @remarks	Originally called 'trippancy_link'
  */
 void Animation::animLink() {
-	if (_vm->_menu->isActive() | _vm->_onToolbar | _vm->_seeScroll)
+	if (_vm->_menu->isActive() | _vm->_seeScroll)
 		return;
 	for (int16 i = 0; i < kSpriteNumbMax; i++) {
 		if (_sprites[i]._quick && _sprites[i]._visible)
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 0a4e7b1c03f..54bede1af9d 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -388,7 +388,6 @@ bool AvalancheEngine::loadGame(const int16 slot) {
 	refreshObjectList();
 	_animation->updateSpeed();
 	drawDirection();
-	_onToolbar = false;
 	_animation->animLink();
 	_background->update();
 
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 70e2e8689f7..e27848c1dc1 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -162,9 +162,6 @@ private:
 #endif
 
 public:
-	static const int16 kXW = 30;
-	static const int16 kYW = 36; // x width & y whatsit
-	static const int16 kMargin = 5;
 	static const MouseHotspotType kMouseHotSpots[9];
 	static const int16 kMaxSprites = 2; // Current max no. of sprites.
 
@@ -184,8 +181,6 @@ public:
 	};
 
 	// These following static constants should be included in CFG when it's written.
-
-	static const bool kSlowComputer = false; // Stops walking when mouse touches toolbar.
 	static const int16 kBorder = 1; // size of border on shadowboxes
 	static const int16 kWalk = 3;
 	static const int16 kRun = 5;
@@ -282,7 +277,7 @@ public:
 	int16 _talkX, _talkY;
 	Color _talkBackgroundColor, _talkFontColor;
 	byte _scrollBells; // no. of times to ring the bell
-	bool _onToolbar, _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
+	bool _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
 	char _objectList[10];
 	// Called .free() for them in ~Gyro().
 	int8 _scoreToDisplay[3];
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 797301898bf..1e739709b1b 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1243,7 +1243,6 @@ void AvalancheEngine::guideAvvy(Common::Point cursorPos) {
 
 void AvalancheEngine::checkClick() {
 	Common::Point cursorPos = getMousePos();
-	_onToolbar = kSlowComputer && ((cursorPos.y >= 169) || (cursorPos.y <= 10));
 
 	/*if (mrelease > 0)
 		after_the_scroll = false;*/
@@ -1523,7 +1522,6 @@ void AvalancheEngine::newGame() {
 	_thinkThing = true;
 	_thinks = 2;
 	refreshObjectList();
-	_onToolbar = false;
 	_seeScroll = false;
 
 	avvy->appear(300, 117, kDirRight); // Needed to initialize Avalot.