AVALANCHE: Remove remaining off and on calls in commented code

4 files changed, 20 insertions, 18 deletions

diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index e2f772145b..90966c4cf9 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -103,7 +103,7 @@ void AnimationType::init(byte spritenum, bool doCheck, Animation *anim) {
 	}
 	_animCount++;
 
-	// on;
+	CursorMan.showMouse(true);
 	_x = 0;
 	_y = 0;
 	_quick = true;
@@ -1051,13 +1051,13 @@ void Animation::arrowProcs(byte tripnum) {
 #if 0
 			tr[1].done; { Deallocate normal pic of Avvy. }
 
-			off;
+			CursorMan.showMouse(false);
 			for byte fv:=0 to 1 do
 			begin
 			cp:=1-cp;
 			getback;
 			end;
-			on;
+			CursorMan.showMouse(true);
 #endif
 			_vm->_lucerna->gameOver();
 
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index 4be9573015..701435e096 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -38,37 +38,37 @@
 
 namespace Avalanche {
 
-void HeadType::init(char trig, char altTrig, Common::String title, byte pos, MenuFunc setupFunc, MenuFunc chooseFunc, Menu *dr) {
+void HeadType::init(char trig, char altTrig, Common::String title, byte pos, MenuFunc setupFunc, MenuFunc chooseFunc, Menu *menu) {
 	_trigger = trig;
 	_altTrigger = altTrig;
 	_title = title;
 	_position = pos;
-	_xpos = _position * _dr->kSpacing + _dr->kIndent;
-	_xright = (_position + 1) * _dr->kSpacing + _dr->kIndent;
+	_xpos = _position * _menu->kSpacing + _menu->kIndent;
+	_xright = (_position + 1) * _menu->kSpacing + _menu->kIndent;
 	_setupFunc = setupFunc;
 	_chooseFunc = chooseFunc;
 
-	_dr = dr;
+	_menu = menu;
 }
 
 void HeadType::draw() {
 	CursorMan.showMouse(false);
-	_dr->drawMenuText(_xpos, 1, _trigger, _title, true, false);
+	_menu->drawMenuText(_xpos, 1, _trigger, _title, true, false);
 	CursorMan.showMouse(true);
 }
 
 void HeadType::highlight() {
 	CursorMan.showMouse(false);
 
-	_dr->_vm->_sound->stopSound();
-	_dr->drawMenuText(_xpos, 1, _trigger, _title, true, true);
+	_menu->_vm->_sound->stopSound();
+	_menu->drawMenuText(_xpos, 1, _trigger, _title, true, true);
 
-	_dr->_activeMenuItem._left = _xpos;
-	_dr->_activeMenuItem._activeNow = true;
-	_dr->_activeMenuItem._activeNum = _position;
-	_dr->_menuActive = true;
+	_menu->_activeMenuItem._left = _xpos;
+	_menu->_activeMenuItem._activeNow = true;
+	_menu->_activeMenuItem._activeNum = _position;
+	_menu->_menuActive = true;
 
-	_dr->_vm->_gyro->_currentMouse = 177; // Force redraw of cursor.
+	_menu->_vm->_gyro->_currentMouse = 177; // Force redraw of cursor.
 }
 
 bool HeadType::parseAltTrigger(char key) {
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index 35acbbe718..da9f93b059 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -54,7 +54,7 @@ public:
 	bool parseAltTrigger(char key);
 
 private:
-	Menu *_dr;
+	Menu *_menu;
 };
 
 struct OptionType {
diff --git a/engines/avalanche/pingo.cpp b/engines/avalanche/pingo.cpp
index 0e6ec52f31..b97fb67282 100644
--- a/engines/avalanche/pingo.cpp
+++ b/engines/avalanche/pingo.cpp
@@ -57,7 +57,7 @@ const
 var fv:byte; gd,gm:int16; r:char;
 begin;
 	dusk; delavvy;
-	off;
+	CursorMan.showMouse(false);
 	cleardevice; setfillstyle(xhatchfill,11);
 	settextstyle(1,0,4); settextjustify(1,1);
 	dplot(320,10,title);
@@ -76,7 +76,9 @@ begin;
 	setcolor(yellow);   outtextxy(gd+1,gm-1,fish);
 	end;
 	newpointer(6); { TTHand }
-	dawn; on; setbkcolor(1); repeat check until (mpress>0) or keypressed;
+	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;