AVALANCHE: More clean up, removement of dead code, some rearranging.

5 files changed, 17 insertions, 77 deletions

diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index 701435e096..b786399815 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -123,8 +123,7 @@ void MenuItem::displayOption(byte y, bool highlit) {
 
 void MenuItem::display() {
 	CursorMan.showMouse(false);
-	//setfillstyle(1, menu_b);
-	//setcolor(menu_border);
+
 	_firstlix = true;
 	_flx1 = _left - 2;
 	_flx2 = _left + _width;
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index da9f93b059..e1d42055bb 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -71,7 +71,7 @@ public:
 	uint16 _width, _left;
 	bool _firstlix;
 	int16 _flx1, _flx2, _fly;
-	byte _oldY; // used by lightUp */
+	byte _oldY; // used by lightUp
 	bool _activeNow; // Is there an active option now?
 	byte _activeNum; // And if so, which is it?
 	byte _choiceNum; // Your choice?
@@ -138,7 +138,7 @@ private:
 	static const byte kHighlightFontColor = kColorWhite;
 	static const byte kDisabledColor = kColorDarkgray;
 
-	bool _menuActive; // Kludge so we don't have to keep referring to Dropdown
+	bool _menuActive; // Kludge so we don't have to keep referring to the menu.
 
 	AvalancheEngine *_vm;
 
diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk
index 4c50329f68..be8a103f66 100644
--- a/engines/avalanche/module.mk
+++ b/engines/avalanche/module.mk
@@ -1,25 +1,25 @@
 MODULE := engines/avalanche
 
 MODULE_OBJS = \
+	acci.o \
+	animation.o \
 	avalanche.o \
-	graphics.o \
-	parser.o \
 	avalot.o \
+	background.o \
+	closing.o \
 	console.o \
 	detection.o \
+	graphics.o \
 	gyro.o \
+	lucerna.o \
+	menu.o \
+	parser.o \
 	pingo.o \
 	scrolls.o \
-	lucerna.o \
-	background.o \
 	sequence.o \
-	timer.o \
-	animation.o \
-	acci.o \
-	menu.o \
-	closing.o \
-	sound.o
-
+	sound.o \
+	timer.o
+	
 # This module can be built as a plugin
 ifeq ($(ENABLE_AVALANCHE), DYNAMIC_PLUGIN)
 PLUGIN := 1
diff --git a/engines/avalanche/pingo.cpp b/engines/avalanche/pingo.cpp
index b97fb67282..7196f46687 100644
--- a/engines/avalanche/pingo.cpp
+++ b/engines/avalanche/pingo.cpp
@@ -49,41 +49,6 @@ void Pingo::dPlot(int16 x, int16 y, Common::String z) {
 }
 
 void Pingo::bossKey() {
-#if 0
-const
-	months : array[0..11] of char = 'JFMAMJJASOND';
-	title = 'Net Profits';
-	fish = 224; // 'à'
-var fv:byte; gd,gm:int16; r:char;
-begin;
-	dusk; delavvy;
-	CursorMan.showMouse(false);
-	cleardevice; setfillstyle(xhatchfill,11);
-	settextstyle(1,0,4); settextjustify(1,1);
-	dplot(320,10,title);
-	settextstyle(1,0,0); setusercharsize(4,3,7,12);
-	for fv:=0 to 11 do
-	begin;
-	dplot(26+fv*52,187,months[fv]);
-	bar(fv*52,177-fv*14,51+fv*52,180);
-	rectangle(fv*52,177-fv*14,51+fv*52,180);
-	end;
-	settextstyle(0,0,1);
-	for fv:=1 to 177 do
-	begin;
-	gd:=random(630); gm:=random(160)+30;
-	setcolor(lightred); outtextxy(gd  ,gm  ,fish);
-	setcolor(yellow);   outtextxy(gd+1,gm-1,fish);
-	end;
-	newpointer(6); { TTHand }
-	dawn;
-	CursorMan.showMouse(true);
-	setbkcolor(1); repeat check until (mpress>0) or keypressed;
-	while keypressed do r:=readkey; setbkcolor(0); settextjustify(0,0);
-	dusk; dawn;
-	copy02;
-#endif
-
 	warning("STUB: Pingo::bossKey()");
 }
 
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index b2a81a7b2e..d4462aac17 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -423,9 +423,6 @@ void Scrolls::drawScroll(ScrollsFunctionType modeFunc) {
 	_vm->_graphics->_scrolls.fillRect(Common::Rect(mx - lx - 15, my - ly, mx - lx - 14, my + ly), kColorRed);
 	_vm->_graphics->_scrolls.fillRect(Common::Rect(mx + lx + 15, my - ly, mx + lx + 16, my + ly), kColorRed);
 
-//	CHECKME: unused?
-//	ex = mx - lx;
-//	int16 ey = my - ly;
 	mx -= lx;
 	my -= ly + 2;
 
@@ -451,7 +448,6 @@ void Scrolls::drawScroll(ScrollsFunctionType modeFunc) {
 		iconIndent = 53;
 	}
 
-
 	for (int i = 0; i < _vm->_gyro->_scrollNum; i++) {
 		if (!_vm->_gyro->_scroll[i].empty())
 			switch (_vm->_gyro->_scroll[i][_vm->_gyro->_scroll[i].size() - 1]) {
@@ -485,7 +481,7 @@ void Scrolls::drawScroll(ScrollsFunctionType modeFunc) {
 
 	_vm->_gyro->_underScroll = my * 2 + 6; // Multiplying because of the doubled screen height.
 	ringBell();
-	//my = getpixel(0, 0);
+	
 	_vm->_gyro->_dropsOk = false;
 	dodgem();
 
@@ -493,22 +489,12 @@ void Scrolls::drawScroll(ScrollsFunctionType modeFunc) {
 
 	unDodgem();
 	_vm->_gyro->_dropsOk = true;
-	CursorMan.showMouse(false);
-	// mblit(ex-46,ey-6,ex+lx*2+15,ey+ly*2+6,3,0);
-	//mblit((ex - 46) / 8, ey - 6, 1 + (ex + lx * 2 + 15) / 8, ey + ly * 2 + 6, cp, 1 - cp);
-	//blitfix();
-	CursorMan.showMouse(true);
-	//settextjustify(0, 0); // sink
+	
 	resetScrollDriver();
-	/*if (_vm->_gyro->mpress > 0)
-	_vm->_gyro->after_the_scroll = true;*/
-
-	warning("STUB: Scrolls::drawScroll()");
 }
 
 void Scrolls::drawBubble(ScrollsFunctionType modeFunc) {
 	Common::Point points[3];
-//	byte *rp1, *rp2; // replace: 1=bubble, 2=pointer
 
 	CursorMan.showMouse(false);
 	int16 xl = 0;
@@ -557,9 +543,6 @@ void Scrolls::drawBubble(ScrollsFunctionType modeFunc) {
 	_vm->_graphics->drawTriangle(_vm->_graphics->_scrolls, points, _vm->_gyro->_talkBackgroundColor);
 
 
-	// CHECKME: Unused?
-	// yl -= 3;
-
 	// Draw the text of the bubble. The centering of the text was improved here compared to Pascal's settextjustify().
 	// The font is not the same that outtextxy() uses in Pascal. I don't have that, so I used Gyro::characters instead.
 	// It's almost the same, only notable differences are '?', '!', etc.
@@ -570,22 +553,15 @@ void Scrolls::drawBubble(ScrollsFunctionType modeFunc) {
 	}
 
 	ringBell();
-	CursorMan.showMouse(true);
+	CursorMan.showMouse(false);
 	_vm->_gyro->_dropsOk = false;
 
 	// This does the actual drawing to the screen.
 	(this->*modeFunc)();
 
-	CursorMan.showMouse(false);
 	_vm->_gyro->_dropsOk = true;
-
 	CursorMan.showMouse(true); // sink;
 	resetScrollDriver();
-
-#if 0
-	if (_vm->_gyro->mpress > 0)
-		_vm->_gyro->after_the_scroll = true;
-#endif
 }
 
 bool Scrolls::displayQuestion(Common::String question) {