NEVERHOOD: Add Sprite::setVisible and use it instead of direct access to the surface member

8 files changed, 159 insertions, 158 deletions

diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 4539b37050..1cc4b43dbb 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -174,7 +174,7 @@ void AsScene1001Door::callback1() {
 		break;
 	case 3:
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 		break;
 	default:
 		setFileHash(0x624C0498, 0, -1);
@@ -193,7 +193,7 @@ void AsScene1001Door::callback2() {
 void AsScene1001Door::callback3() {
 	_soundResource1.play();
 	setFileHash1();
-	_surface->setVisible(false);	
+	setVisible(false);	
 }
 	
 AsScene1001Hammer::AsScene1001Hammer(NeverhoodEngine *vm, Sprite *asDoor)
@@ -255,7 +255,7 @@ uint32 AsScene1001Window::handleMessage(int messageNum, const MessageParam &para
 	case 0x3002:
 		SetMessageHandler(NULL);
 		setGlobalVar(0x03C698DA, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		break;
 	}
 	return 0;
@@ -310,14 +310,14 @@ SsCommonButtonSprite::SsCommonButtonSprite(NeverhoodEngine *vm, Scene *parentSce
 
 	_priority = 1100;
 	_soundFileHash = soundFileHash != 0 ? soundFileHash : 0x44141000; 
-	_surface->setVisible(false);
+	setVisible(false);
 	SetUpdateHandler(&SsCommonButtonSprite::update);
 	SetMessageHandler(&SsCommonButtonSprite::handleMessage);
 }
 	
 void SsCommonButtonSprite::update() {
 	if (_countdown != 0 && (--_countdown) == 0) {
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 	
@@ -326,7 +326,7 @@ uint32 SsCommonButtonSprite::handleMessage(int messageNum, const MessageParam &p
 	switch (messageNum) {
 	case 0x480B:
 		sendMessage(_parentScene, 0x480B, 0);
-		_surface->setVisible(true);
+		setVisible(true);
 		_countdown = 8;
 		_soundResource.play(_soundFileHash);
 		break;
@@ -740,7 +740,7 @@ Class505::Class505(NeverhoodEngine *vm)
 	: AnimatedSprite(vm, 1400) {
 
 	createSurface(1025, 88, 165);
-	_surface->setVisible(false);
+	setVisible(false);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&Class505::handleMessage);	
 }
@@ -752,11 +752,11 @@ uint32 Class505::handleMessage(int messageNum, const MessageParam &param, Entity
 		_x = ((Sprite*)sender)->getX() - 98;
 		_y = ((Sprite*)sender)->getY() - 111;
 		setFileHash(0x0422255A, 0, -1);
-		_surface->setVisible(true);
+		setVisible(true);
 		break;
 	case 0x3002:
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 		break;
 	}
 	return messageResult;
@@ -844,7 +844,7 @@ Class426::Class426(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, ui
 	_x = _spriteResource.getPosition().x;
 	_y = _spriteResource.getPosition().y;
 
-	_surface->setVisible(false);
+	setVisible(false);
 	_needRefresh = true;
 	
 	SetUpdateHandler(&Class426::update);
@@ -906,7 +906,7 @@ void Class426::update() {
 			_countdown = 4;
 		} else if (_status == 3) {
 			_status = 0;
-			_surface->setVisible(false);
+			setVisible(false);
 		}
 	}
 }
@@ -918,7 +918,7 @@ uint32 Class426::handleMessage(int messageNum, const MessageParam &param, Entity
 		sendMessage(_parentScene, 0x480B, 0);
 		_status = 1;
 		_countdown = 4;
-		_surface->setVisible(true);
+		setVisible(true);
 		_soundResource.play(_soundFileHash);
 		break;
 	}
@@ -1195,7 +1195,7 @@ Class506::Class506(NeverhoodEngine *vm)
 		setFileHash(0x004A4495, -1, -1);
 		_newHashListIndex = -2;
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 	SetUpdateHandler(&Class506::update);
 	SetMessageHandler(&Class506::handleMessage4491B0);	
@@ -1241,7 +1241,7 @@ void Class506::sub449250() {
 	setFileHash(0x004A4495, 0, -1);
 	SetMessageHandler(&Class506::handleMessage4491B0);
 	_newHashListIndex = -2;
-	_surface->setVisible(true);
+	setVisible(true);
 }
 
 void Class506::sub449280() {
@@ -1249,11 +1249,11 @@ void Class506::sub449280() {
 	_playBackwards = true;
 	SetMessageHandler(&Class506::handleMessage449210);
 	SetAnimationCallback3(&Class506::sub4492C0);
-	_surface->setVisible(true);
+	setVisible(true);
 }
 
 void Class506::sub4492C0() {
-	_surface->setVisible(false);
+	setVisible(false);
 	setFileHash1();
 }
 
@@ -1263,26 +1263,26 @@ Class478::Class478(NeverhoodEngine *vm, Klayman *klayman)
 	createSurface(1200, 40, 163);
 	SetUpdateHandler(&Class478::update);
 	SetMessageHandler(&Sprite::handleMessage);
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void Class478::update() {
 	if (_klayman->getCurrAnimFileHash() == 0x3A292504) {
 		setFileHash(0xBA280522, _frameIndex, -1);
 		_newHashListIndex = _klayman->getFrameIndex();
-		_surface->setVisible(true);
+		setVisible(true);
 		_x = _klayman->getX(); 
 		_y = _klayman->getY(); 
 		setDoDeltaX(_klayman->isDoDeltaX() ? 1 : 0);
 	} else if (_klayman->getCurrAnimFileHash() == 0x122D1505) {
 		setFileHash(0x1319150C, _frameIndex, -1);
 		_newHashListIndex = _klayman->getFrameIndex();
-		_surface->setVisible(true);
+		setVisible(true);
 		_x = _klayman->getX(); 
 		_y = _klayman->getY(); 
 		setDoDeltaX(_klayman->isDoDeltaX() ? 1 : 0);
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 	AnimatedSprite::update();
 }
@@ -1294,19 +1294,19 @@ Class479::Class479(NeverhoodEngine *vm, Scene *parentScene, Klayman *klayman)
 	SetUpdateHandler(&Class479::update);
 	SetMessageHandler(&Class479::handleMessage);
 	createSurface(1000, 33, 41);
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void Class479::update() {
 	if (_klayman->getCurrAnimFileHash() == 0xAC20C012 && _klayman->getFrameIndex() < 50) {
 		setFileHash(0x9820C913, _klayman->getFrameIndex(), -1);
 		_newHashListIndex = _klayman->getFrameIndex();
-		_surface->setVisible(true);
+		setVisible(true);
 		_x = _klayman->getX();
 		_y = _klayman->getY();
 		setDoDeltaX(_klayman->isDoDeltaX() ? 1 : 0);
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 	AnimatedSprite::update();
 }
@@ -1656,7 +1656,7 @@ AsScene1004TrashCan::AsScene1004TrashCan(NeverhoodEngine *vm)
 	createSurface(800, 56, 50);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsScene1004TrashCan::handleMessage);
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 uint32 AsScene1004TrashCan::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
@@ -1669,11 +1669,11 @@ uint32 AsScene1004TrashCan::handleMessage(int messageNum, const MessageParam &pa
 		break;
 	case 0x2002:
 		setFileHash(0xEB312C11, 0, -1);
-		_surface->setVisible(true);
+		setVisible(true);
 		break;
 	case 0x3002:
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 		break;
 	}
 	return 0;
diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp
index ff0493713c..9cab544710 100644
--- a/engines/neverhood/module1200.cpp
+++ b/engines/neverhood/module1200.cpp
@@ -202,7 +202,7 @@ AsScene1201Tape::AsScene1201Tape(NeverhoodEngine *vm, Scene *parentScene, uint32
 	if (!getSubVar(0x02038314, _nameHash) && !getSubVar(0x02720344, _nameHash)) {
 		SetMessageHandler(&AsScene1201Tape::handleMessage);
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	}
 }
@@ -216,7 +216,7 @@ uint32 AsScene1201Tape::handleMessage(int messageNum, const MessageParam &param,
 		break;
 	case 0x4806:
 		setSubVar(0x02038314, _nameHash, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 		break;
 	}
@@ -283,7 +283,7 @@ AsScene1201RightDoor::AsScene1201RightDoor(NeverhoodEngine *vm, Sprite *klayman,
 		_countdown = 25;
 	} else {
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -310,21 +310,21 @@ uint32 AsScene1201RightDoor::handleMessage(int messageNum, const MessageParam &p
 void AsScene1201RightDoor::sub40D7E0() {
 	setFileHash(0xD088AC30, 0, -1);
 	_newHashListIndex = -2;
-	_surface->setVisible(true);
+	setVisible(true);
 	_soundResource.play(calcHash("fxDoorOpen20"));
 }
 
 void AsScene1201RightDoor::sub40D830() {
 	setFileHash(0xD088AC30, -1, -1);
 	_playBackwards = true;
-	_surface->setVisible(true);
+	setVisible(true);
 	_soundResource.play(calcHash("fxDoorClose20"));
 	SetAnimationCallback3(&AsScene1201RightDoor::sub40D880);
 }
 
 void AsScene1201RightDoor::sub40D880() {
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 		
 Class464::Class464(NeverhoodEngine *vm)
@@ -334,7 +334,7 @@ Class464::Class464(NeverhoodEngine *vm)
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&Class464::handleMessage);
 	SetSpriteCallback(&AnimatedSprite::updateDeltaXY);
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 uint32 Class464::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
@@ -344,11 +344,11 @@ uint32 Class464::handleMessage(int messageNum, const MessageParam &param, Entity
 		_x = 436;
 		_y = 339;
 		setFileHash(0xA060C599, 0, -1);
-		_surface->setVisible(true);
+		setVisible(true);
 		break;
 	case 0x3002:
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 		removeCallbacks();
 		break;
 	}
@@ -447,7 +447,7 @@ Class465::Class465(NeverhoodEngine *vm, Sprite *asTntMan)
 	SetMessageHandler(&Sprite::handleMessage);
 	SetSpriteCallback(&Class465::spriteUpdate40D150);
 	setFileHash(0x828C0411, 0, -1);
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 Class465::~Class465() {
@@ -457,7 +457,7 @@ Class465::~Class465() {
 void Class465::update() {
 	AnimatedSprite::update();
 	if (getGlobalVar(0x20A0C516)) {
-		_surface->setVisible(true);
+		setVisible(true);
 		SetUpdateHandler(&AnimatedSprite::update);
 		// TODO Sound1ChList_addSoundResource(0x041080A4, 0x460A1050, true);
 		// TODO Sound1ChList_playLooping(0x460A1050);
@@ -540,7 +540,7 @@ uint32 AsScene1201Match::handleMessage40C360(int messageNum, const MessageParam
 		messageResult = 1;
 		break;
 	case 0x4806:
-		_surface->setVisible(false);
+		setVisible(false);
 		setGlobalVar(0x0112090A, 3);
 		break;
 	}
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp
index 518568cdb0..f27952f94c 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/module1300.cpp
@@ -428,7 +428,7 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which)
 	_class595 = addSprite(new Class595(_vm, this));
 	_sprite1 = insertStaticSprite(0x942FC224, 300);
 	_sprite2 = insertStaticSprite(0x70430830, 1200);
-	_sprite2->getSurface()->setVisible(false);
+	_sprite2->setVisible(false);
 	_sprite3 = insertStaticSprite(0x16E01E20, 1100);
 
 	_asRing1 = addSprite(new AsScene1002Ring(_vm, this, false, 218, 122, _class595->getSurface()->getDrawRect().y, false));
@@ -533,7 +533,7 @@ uint32 Scene1302::handleMessage(int messageNum, const MessageParam &param, Entit
 		}
 		break;
 	case 0x2032:
-		_sprite2->getSurface()->setVisible(true);
+		_sprite2->setVisible(true);
 		break;
 	case 0x4806:
 		sendMessage(_parentModule, 0x1024, 2);
@@ -555,7 +555,7 @@ uint32 Scene1302::handleMessage(int messageNum, const MessageParam &param, Entit
 		if (sender == _asRing2) {
 			sendMessage(_asBridge, 0x4809, 0);
 			setGlobalVar(0x13206309, 0);
-			_sprite2->getSurface()->setVisible(false);
+			_sprite2->setVisible(false);
 		} else if (sender == _asRing4) {
 			sendMessage(_ssFence, 0x4809, 0);
 			setGlobalVar(0x80101B1E, 0);
@@ -627,7 +627,7 @@ uint32 AsScene1303Balloon::hmBalloonPopped(int messageNum, const MessageParam &p
 		_soundResource.play(0x470007EE);
 		setFileHash1();
 		SetMessageHandler(NULL);
-		_surface->setVisible(false);
+		setVisible(false);
 		break;
 	}
 	return messageResult;
@@ -687,7 +687,7 @@ Class544::Class544(NeverhoodEngine *vm, Scene *parentScene, int surfacePriority,
 	: AnimatedSprite(vm, 0x548E9411, surfacePriority, x, y), _parentScene(parentScene) {
 	
 	if (getGlobalVar(0x31C63C51)) {
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	} else {
 		SetMessageHandler(&Class544::handleMessage);
@@ -703,7 +703,7 @@ uint32 Class544::handleMessage(int messageNum, const MessageParam &param, Entity
 		break;
 	case 0x4806:
 		setGlobalVar(0x31C63C51, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 		break;
 	}
@@ -830,14 +830,14 @@ void AsScene1306Elevator::update() {
 	AnimatedSprite::update();
 	if (_frameIndex == 7) {
 		_soundResource3.play();
-		_asElevatorDoor->getSurface()->setVisible(false);
+		_asElevatorDoor->setVisible(false);
 	}
 }
 
 void AsScene1306Elevator::upGoingDown() {
 	AnimatedSprite::update();
 	if (_frameIndex == 5) {
-		_asElevatorDoor->getSurface()->setVisible(true);
+		_asElevatorDoor->setVisible(true);
 	}
 }
 
@@ -861,7 +861,7 @@ uint32 AsScene1306Elevator::handleMessage(int messageNum, const MessageParam &pa
 }
 
 void AsScene1306Elevator::stGoingUp() {
-	_surface->setVisible(true);
+	setVisible(true);
 	_isDown = false;
 	SetUpdateHandler(&AsScene1306Elevator::update);
 	setFileHash(0x043B0270, 0, -1);
@@ -875,13 +875,13 @@ void AsScene1306Elevator::cbGoingUpEvent() {
 	_isUp = true;
 	_countdown = 144;
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void AsScene1306Elevator::stGoingDown() {
 	SetUpdateHandler(&AsScene1306Elevator::upGoingDown);
 	_isUp = false;
-	_surface->setVisible(true);
+	setVisible(true);
 	setFileHash(0x043B0270, -1, -1);
 	_playBackwards = true;
 	SetAnimationCallback3(&AsScene1306Elevator::cbGoingDownEvent);
@@ -1466,7 +1466,7 @@ Class549::Class549(NeverhoodEngine *vm, Scene *parentScene)
 	_parentScene(parentScene) {
 	
 	SetMessageHandler(&Class549::handleMessage);
-	_surface->setVisible(false);
+	setVisible(false);
 	setFileHash1();
 }
 
@@ -1488,7 +1488,7 @@ uint32 Class549::handleMessage(int messageNum, const MessageParam &param, Entity
 
 void Class549::sub455470() {
 	setFileHash(0xBA0AE050, 0, -1);
-	_surface->setVisible(true);
+	setVisible(true);
 	SetAnimationCallback3(&Class549::hide);
 	_soundResource.play(calcHash("fxDoorOpen38"));
 }
@@ -1496,13 +1496,13 @@ void Class549::sub455470() {
 void Class549::hide() {
 	sendMessage(_parentScene, 0x2000, 0);
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void Class549::sub4554F0() {
 	setFileHash(0xBA0AE050, -1, -1);
 	_playBackwards = true;
-	_surface->setVisible(true);
+	setVisible(true);
 	SetAnimationCallback3(&Class549::sub455550);
 	_soundResource.play(calcHash("fxDoorClose38"));
 }
@@ -1541,14 +1541,14 @@ void Class592::sub455710() {
 void Class592::sub455740() {
 	sendMessage(_parentScene, 0x2004, 0);
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 Class593::Class593(NeverhoodEngine *vm, Scene *parentScene)
 	: AnimatedSprite(vm, 0x80180A10, 100, 320, 240), _parentScene(parentScene) {
 	
 	SetMessageHandler(&Class593::handleMessage);
-	_surface->setVisible(false);
+	setVisible(false);
 	setFileHash1();
 	Entity::_priority = 1200;
 }
@@ -1570,7 +1570,7 @@ uint32 Class593::handleMessage(int messageNum, const MessageParam &param, Entity
 
 void Class593::sub4558F0() {
 	setFileHash(0x80180A10, 0, -1);
-	_surface->setVisible(false);
+	setVisible(false);
 	_newHashListIndex = -2;
 }
 
@@ -1583,13 +1583,13 @@ void Class593::sub455920() {
 void Class593::sub455950() {
 	sendMessage(_parentScene, 0x2003, 0);
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 Class601::Class601(NeverhoodEngine *vm, uint32 fileHash, int index)
 	: StaticSprite(vm, fileHash, 100) {
 	
-	_surface->setVisible(false);
+	setVisible(false);
 	_x = _spriteResource.getPosition().x + index * 20;
 	StaticSprite::update();
 }
@@ -1680,7 +1680,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
 		if (getGlobalVar(0x80455A41)) {
 			_sprite5 = addSprite(new Class592(_vm, this));
 			_sprite4 = insertStaticSprite(0x0101A624, 1100);
-			_sprite4->getSurface()->setVisible(false);
+			_sprite4->setVisible(false);
 		} else {
 			_sprite5 = insertStaticSprite(0x080811A0, 100);
 			setRectList(0x004B5980);
@@ -1689,13 +1689,13 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
 		InsertKlayman(KmScene1308, 41, 440);
 		setMessageList(0x004B57D0);
 		sendMessage(_class549, 0x4808, 0);
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 		if (getGlobalVar(0x80455A41)) {
 			_sprite4 = insertStaticSprite(0x0101A624, 1100);
-			_klayman->getSurface()->setVisible(false);
+			_klayman->setVisible(false);
 		} else {
 			_sprite5 = insertStaticSprite(0x080811A0, 100);
-			_klayman->getSurface()->setVisible(false);
+			_klayman->setVisible(false);
 		}
 	}
 
@@ -1744,8 +1744,8 @@ uint32 Scene1308::handleMessage(int messageNum, const MessageParam &param, Entit
 		} else if (param.asInteger() == 0x4AC68808) {
 			clearRectList();
 			sendMessage(_class549, 0x4809, 0);
-			_sprite1->getSurface()->setVisible(false);
-			_klayman->getSurface()->setVisible(false);
+			_sprite1->setVisible(false);
+			_klayman->setVisible(false);
 		}
 		break;
 	case 0x1022:
@@ -1763,19 +1763,19 @@ uint32 Scene1308::handleMessage(int messageNum, const MessageParam &param, Entit
 			setRectList(0x004B5980);
 		}
 		setMessageList(0x004B57E8);
-		_sprite1->getSurface()->setVisible(true);
-		_klayman->getSurface()->setVisible(true);
+		_sprite1->setVisible(true);
+		_klayman->setVisible(true);
 		break;
 	case 0x2001:
 		sendMessage(_parentModule, 0x1009, 0);
 		break;
 	case 0x2003:
-		_class601_1->getSurface()->setVisible(false);
-		_class601_2->getSurface()->setVisible(false);
-		_class601_3->getSurface()->setVisible(false);
+		_class601_1->setVisible(false);
+		_class601_2->setVisible(false);
+		_class601_3->setVisible(false);
 		break;
 	case 0x2004:
-		_sprite4->getSurface()->setVisible(true);
+		_sprite4->setVisible(true);
 		setRectList(0x004B5990);
 		break;
 	case 0x4807:
@@ -1783,9 +1783,9 @@ uint32 Scene1308::handleMessage(int messageNum, const MessageParam &param, Entit
 		break;
 	case 0x480F:
 		sendMessage(_class593, 0x2002, 0);
-		_class601_1->getSurface()->setVisible(true);
-		_class601_2->getSurface()->setVisible(true);
-		_class601_3->getSurface()->setVisible(true);
+		_class601_1->setVisible(true);
+		_class601_2->setVisible(true);
+		_class601_3->setVisible(true);
 		break;
 	case 0x4826:
 		if (sender == _class489) {
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp
index 32918b1424..f50fb25b79 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/module1400.cpp
@@ -259,7 +259,7 @@ void Class526::spriteUpdate466720() {
 		setFileHash1();
 		SetSpriteCallback(NULL);
 		SetMessageHandler(NULL);
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -297,7 +297,7 @@ void Class527::spriteUpdate466920() {
 		setFileHash1();
 		SetSpriteCallback(NULL);
 		SetMessageHandler(NULL);
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -322,7 +322,7 @@ Class528::Class528(NeverhoodEngine *vm, Sprite *klayman, bool flag)
 	} else {
 		_flag = false;
 		setFileHash1();
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -356,7 +356,7 @@ uint32 Class528::handleMessage(int messageNum, const MessageParam &param, Entity
 
 void Class528::sub466BF0() {
 	_flag = true;
-	_surface->setVisible(true);
+	setVisible(true);
 	setFileHash(0x04551900, 0, -1);
 	_newHashListIndex = -2;
 	_soundResource.play(calcHash("fxDoorOpen24"));
@@ -364,7 +364,7 @@ void Class528::sub466BF0() {
 
 void Class528::sub466C50() {
 	_flag = false;
-	_surface->setVisible(true);
+	setVisible(true);
 	setFileHash(0x04551900, -1, -1);
 	_soundResource.play(calcHash("fxDoorClose24"));
 	_playBackwards = true;
@@ -373,7 +373,7 @@ void Class528::sub466C50() {
 
 void Class528::sub466CB0() {
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 static const Class489Item kClass489Items[] = {
@@ -577,7 +577,7 @@ void Class489::sub434D80() {
 		setFileHash1();
 		SetMessageHandler(&Sprite::handleMessage);
 		SetSpriteCallback(NULL);
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -681,24 +681,24 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
 	_ssButton = addSprite(new SsCommonButtonSprite(_vm, this, 0xB84B1100, 100, 0));
 	_sprite1 = insertStaticSprite(0x38EA100C, 1005);
 	_sprite2 = insertStaticSprite(0x98D0223C, 1200);
-	_sprite2->getSurface()->setVisible(false);
+	_sprite2->setVisible(false);
 
 	if (which < 0) {
 		InsertKlayman(KmScene1401, 380, 447);
 		setMessageList(0x004B65C8);
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 	} else if (which == 1) {
 		InsertKlayman(KmScene1401, 0, 447);
 		setMessageList(0x004B65D0);
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 	} else if (which == 2) {
 		InsertKlayman(KmScene1401, 660, 447);
 		setMessageList(0x004B65D8);
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 	} else {
 		InsertKlayman(KmScene1401, 290, 413);
 		setMessageList(0x004B65E8);
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 	}
 
 	if (getGlobalVar(0x04A105B3) == 2) {
@@ -737,10 +737,10 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
 void Scene1401::update() {
 	Scene::update();
 	if (_class489 && !_flag && _class489->getY() < 360) {
-		_sprite2->getSurface()->setVisible(true);
+		_sprite2->setVisible(true);
 		_flag = true;
 	} else {
-		_sprite2->getSurface()->setVisible(false);
+		_sprite2->setVisible(false);
 	}
 }
 
@@ -793,13 +793,13 @@ uint32 Scene1401::handleMessage(int messageNum, const MessageParam &param, Entit
 		}						
 		break;
 	case 0x482A:
-		_sprite1->getSurface()->setVisible(true);
+		_sprite1->setVisible(true);
 		if (_class489) {
 			sendMessage(_class489, 0x482B, 0);
 		}
 		break;
 	case 0x482B:
-		_sprite1->getSurface()->setVisible(false);
+		_sprite1->setVisible(false);
 		if (_class489) {
 			sendMessage(_class489, 0x482A, 0);
 		}
@@ -863,13 +863,13 @@ uint32 Class482::handleMessage(int messageNum, const MessageParam &param, Entity
 void Class482::sub428500() {
 	sendMessage(_parentScene, 0x2000, 0);
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void Class482::sub428530() {
 	sendMessage(_parentScene, 0x2001, 0);
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void Class482::sub428560() {
@@ -994,7 +994,7 @@ uint32 Scene1402::handleMessage(int messageNum, const MessageParam &param, Entit
 				sendMessage(_parentModule, 0x1009, 0);
 			} else {
 				clearRectList();
-				_klayman->getSurface()->setVisible(false);
+				_klayman->setVisible(false);
 				showMouse(false);
 				sendMessage(_class482, 0x2002, 0);
 				sub428220();
@@ -1258,7 +1258,7 @@ void AsScene1407Mouse::stGoThroughHole() {
 	SetMessageHandler(NULL);
 	SetUpdateHandler(&AsScene1407Mouse::upGoThroughHole);
 	SetAnimationCallback3(&AsScene1407Mouse::stArriveAtHole);
-	_surface->setVisible(false);
+	setVisible(false);
 	_countdown = 12;
 }
 
@@ -1270,11 +1270,11 @@ void AsScene1407Mouse::stArriveAtHole() {
 		sendMessage(_parentScene, 0x2000, 0);
 		_walkDestX = 512;
 		stWalkToDest();
-		_surface->setVisible(true);
+		setVisible(true);
 	} else {
 		_walkDestX = _x + 14;
 		stWalkToDest();
-		_surface->setVisible(true);
+		setVisible(true);
 	}
 }
 
@@ -1294,7 +1294,7 @@ Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	_asMouse = addSprite(new AsScene1407Mouse(_vm, this));
 	_ssResetButton = insertStaticSprite(0x12006600, 100);
-	_ssResetButton->getSurface()->setVisible(false); 
+	_ssResetButton->setVisible(false); 
 
 }
 
@@ -1303,7 +1303,7 @@ void Scene1407::update() {
 	if (_puzzleSolvedCountdown != 0 && (--_puzzleSolvedCountdown == 0)) {
 		sendMessage(_parentModule, 0x1009, 1);
 	} else if (_resetButtonCountdown != 0 && (--_resetButtonCountdown == 0)) {
-		_ssResetButton->getSurface()->setVisible(false);
+		_ssResetButton->setVisible(false);
 	}
 }
 
@@ -1320,7 +1320,7 @@ uint32 Scene1407::handleMessage(int messageNum, const MessageParam &param, Entit
 				param.asPoint().y >= 62 && param.asPoint().y <= 90) {
 				// The reset button was clicked
 				sendMessage(_asMouse, 0x2001, 0);
-				_ssResetButton->getSurface()->setVisible(true);
+				_ssResetButton->setVisible(true);
 				_soundResource.play(0x44045000);
 				_resetButtonCountdown = 12;
 			} else {
@@ -1359,7 +1359,7 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which)
 	insertMouse433(0x0A230219);
 
 	_class401_1 = insertStaticSprite(0x01102A33, 100);
-	_class401_1->getSurface()->setVisible(false);
+	_class401_1->setVisible(false);
 
 	_class401_2 = insertStaticSprite(0x04442520, 995);
 	
@@ -1431,10 +1431,10 @@ uint32 Scene1403::handleMessage(int messageNum, const MessageParam &param, Entit
 		}
 		break;
 	case 0x4807:
-		_class401_1->getSurface()->setVisible(false);
+		_class401_1->setVisible(false);
 		break;
 	case 0x480F:
-		_class401_1->getSurface()->setVisible(true);
+		_class401_1->setVisible(true);
 		break;
 	case 0x4826:
 		if (sender == _class489) {
@@ -1634,7 +1634,7 @@ AsScene1405Tile::AsScene1405Tile(NeverhoodEngine *vm, Scene1405 *parentScene, ui
 	_x = kAsScene1405TileItemPositions[_index].x;
 	_y = kAsScene1405TileItemPositions[_index].y;
 	createSurface1(0x844B805C, 1100);
-	_surface->setVisible(false);
+	setVisible(false);
 	if (getSubVar(0xCCE0280F, _index))
 		_countdown = _vm->_rnd->getRandomNumber(36 - 1) + 1;
 	SetUpdateHandler(&AsScene1405Tile::update);
@@ -1672,7 +1672,7 @@ void AsScene1405Tile::show() {
 	if (!_flag) {
 		_flag = true;
 		_soundResource.play();
-		_surface->setVisible(true);
+		setVisible(true);
 	}
 }
 
@@ -1680,7 +1680,7 @@ void AsScene1405Tile::hide() {
 	if (_flag) {
 		_flag = false;
 		_soundResource.play();
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/module1700.cpp
index 9188dab2b0..58fc83511c 100644
--- a/engines/neverhood/module1700.cpp
+++ b/engines/neverhood/module1700.cpp
@@ -144,7 +144,7 @@ Class606::Class606(NeverhoodEngine *vm, Scene *parentScene, int index, int surfa
 	if (!getSubVar(0x02038314, _index) && !getSubVar(0x02720344, _index)) {
 		SetMessageHandler(&Class606::handleMessage);
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	}
 	_deltaRect = _drawRect;
@@ -164,7 +164,7 @@ uint32 Class606::handleMessage(int messageNum, const MessageParam &param, Entity
 		break;
 	case 0x4806:
 		setSubVar(0x02038314, _index, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 		break;		
 	}
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index 3bc3797152..1f118a4d1f 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -650,7 +650,7 @@ AsScene2201Door::AsScene2201Door(NeverhoodEngine *vm, Klayman *klayman, Sprite *
 	} else {
 		setFileHash(0xE2CB0412, 0, -1);
 		_newHashListIndex = 0;
-		_doorLightSprite->getSurface()->setVisible(false);
+		_doorLightSprite->setVisible(false);
 	}
 }
 
@@ -667,10 +667,10 @@ uint32 AsScene2201Door::handleMessage(int messageNum, const MessageParam &param,
 	case 0x100D:
 		if (param.asInteger() == 0x11001090) {
 			if (_doorOpen)
-				_doorLightSprite->getSurface()->setVisible(true);
+				_doorLightSprite->setVisible(true);
 		} else if (param.asInteger() == 0x11283090) {
 			if (!_doorOpen)
-				_doorLightSprite->getSurface()->setVisible(false);
+				_doorLightSprite->setVisible(false);
 		}
 		break;
 	case 0x2000:
@@ -1254,7 +1254,7 @@ Class545::Class545(NeverhoodEngine *vm, Scene *parentScene, int index, int surfa
 	if (!getSubVar(0x0090EA95, _index) && !getSubVar(0x08D0AB11, _index)) {
 		SetMessageHandler(&Class545::handleMessage);
 	} else {
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	}
 }
@@ -1268,7 +1268,7 @@ uint32 Class545::handleMessage(int messageNum, const MessageParam &param, Entity
 		break;
 	case 0x4806:
 		setSubVar(0x0090EA95, _index, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	}
 	return messageResult;
@@ -1405,10 +1405,10 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which)
 	}
 
 	if (getGlobalVar(0x9A500914)) {
-		_ssSmallLeftDoor->getSurface()->setVisible(false);
+		_ssSmallLeftDoor->setVisible(false);
 		_klayman->getSurface()->getClipRect() = _rightDoorClipRect;
 	} else {
-		_ssSmallRightDoor->getSurface()->setVisible(false);
+		_ssSmallRightDoor->setVisible(false);
 		_klayman->getSurface()->getClipRect() = _leftDoorClipRect;
 	}
 	
@@ -1440,17 +1440,17 @@ uint32 Scene2203::handleMessage(int messageNum, const MessageParam &param, Entit
 		break;
 	case 0x2003:
 		if (sender == _asLeftDoor) {
-			_ssSmallLeftDoor->getSurface()->setVisible(false);
+			_ssSmallLeftDoor->setVisible(false);
 		} else {
-			_ssSmallRightDoor->getSurface()->setVisible(false);
+			_ssSmallRightDoor->setVisible(false);
 		}
 		break;
 	case 0x4808:
 		if (sender == _asLeftDoor) {
-			_ssSmallLeftDoor->getSurface()->setVisible(true);
+			_ssSmallLeftDoor->setVisible(true);
 			_klayman->getSurface()->getClipRect() = _leftDoorClipRect;
 		} else {
-			_ssSmallRightDoor->getSurface()->setVisible(true);
+			_ssSmallRightDoor->setVisible(true);
 			_klayman->getSurface()->getClipRect() = _rightDoorClipRect;
 		}
 		break;
@@ -1734,7 +1734,7 @@ Class607::Class607(NeverhoodEngine *vm, Scene *parentScene, int surfacePriority,
 	: StaticSprite(vm, fileHash, surfacePriority), _parentScene(parentScene) {
 
 	if (getGlobalVar(0x45080C38)) {
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 	} else {
 		SetMessageHandler(&Class607::handleMessage);
@@ -1752,7 +1752,7 @@ uint32 Class607::handleMessage(int messageNum, const MessageParam &param, Entity
 		break;
 	case 0x4806:
 		setGlobalVar(0x45080C38, 1);
-		_surface->setVisible(false);
+		setVisible(false);
 		SetMessageHandler(NULL);
 		break;
 	}
@@ -2191,7 +2191,7 @@ void AsScene2207WallRobotAnimation::stStartAnimation() {
 	} else {
 		setFileHash(0xCCFD6090, 0, -1);
 		_idle = false;
-		_surface->setVisible(true);
+		setVisible(true);
 	}
 }
 
@@ -2207,7 +2207,7 @@ void AsScene2207WallRobotAnimation::cbStopAnimation() {
 	_soundResource4.stop();
 	// TODO Sound1ChList_deleteSoundByHash(0x12121943);
 	_idle = true;
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 AsScene2207WallCannonAnimation::AsScene2207WallCannonAnimation(NeverhoodEngine *vm)
@@ -2242,7 +2242,7 @@ void AsScene2207WallCannonAnimation::stStartAnimation() {
 	if (!_idle) {
 		SetAnimationCallback3(NULL);
 	} else {
-		_surface->setVisible(true);
+		setVisible(true);
 		setFileHash(0x8CAA0099, 0, -1);
 		_idle = false;
 	}
@@ -2254,7 +2254,7 @@ void AsScene2207WallCannonAnimation::stStopAnimation() {
 
 void AsScene2207WallCannonAnimation::cbStopAnimation() {
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 	_idle = true;
 }
 
@@ -2309,8 +2309,8 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which)
 		_asWallRobotAnimation = addSprite(new AsScene2207WallRobotAnimation(_vm, this));
 		_asWallCannonAnimation = addSprite(new AsScene2207WallCannonAnimation(_vm));
 		
-		_asWallRobotAnimation->getSurface()->setVisible(false);
-		_asWallCannonAnimation->getSurface()->setVisible(false);
+		_asWallRobotAnimation->setVisible(false);
+		_asWallCannonAnimation->setVisible(false);
 
 		_ssButton = addSprite(new SsCommonButtonSprite(_vm, this, 0x2C4061C4, 100, 0));
 	
@@ -2452,8 +2452,8 @@ uint32 Scene2207::handleMessage(int messageNum, const MessageParam &param, Entit
 	case 0x480F:
 		sendMessage(_asWallRobotAnimation, 0x2006, 0);
 		sendMessage(_asWallCannonAnimation, 0x2006, 0);
-		_asWallRobotAnimation->getSurface()->setVisible(true);
-		_asWallCannonAnimation->getSurface()->setVisible(true);
+		_asWallRobotAnimation->setVisible(true);
+		_asWallCannonAnimation->setVisible(true);
 		break;
 	case 0x4826:
 		if (sender == _asTape) {
diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp
index 219f595593..82bcc54ac4 100644
--- a/engines/neverhood/module3000.cpp
+++ b/engines/neverhood/module3000.cpp
@@ -462,7 +462,7 @@ SsScene3009FireCannonButton::SsScene3009FireCannonButton(NeverhoodEngine *vm, Sc
 	_deltaRect.y = 0;
 	_deltaRect.width = _spriteResource.getDimensions().width;
 	_deltaRect.height = _spriteResource.getDimensions().height;
-	_surface->setVisible(false);
+	setVisible(false);
 	processDelta();
 	_needRefresh = true;
 	SetUpdateHandler(&SsScene3009FireCannonButton::update);
@@ -474,7 +474,7 @@ void SsScene3009FireCannonButton::update() {
 	StaticSprite::update();
 	if (_flag1 && !_soundResource.isPlaying()) {
 		sendMessage(_parentScene, 0x2000, 0);
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -484,7 +484,7 @@ uint32 SsScene3009FireCannonButton::handleMessage(int messageNum, const MessageP
 	case 0x1011:
 		if (!_flag1 && !_parentScene->sub462E90()) {
 			_flag1 = true;
-			_surface->setVisible(true);
+			setVisible(true);
 			_soundResource.play();
 		}
 		messageResult = 1;
@@ -516,9 +516,9 @@ SsScene3009SymbolEdges::SsScene3009SymbolEdges(NeverhoodEngine *vm, int index)
 void SsScene3009SymbolEdges::update() {
 	if (_blinkCountdown != 0 && (--_blinkCountdown == 0)) {
 		if (_blinkToggle) {
-			_surface->setVisible(true);
+			setVisible(true);
 		} else {
-			_surface->setVisible(false);
+			setVisible(false);
 		}
 		StaticSprite::update();
 		_blinkCountdown = 3;
@@ -527,19 +527,19 @@ void SsScene3009SymbolEdges::update() {
 }
 
 void SsScene3009SymbolEdges::show() {
-	_surface->setVisible(true);
+	setVisible(true);
 	StaticSprite::update();
 	_blinkCountdown = 0;
 }
 
 void SsScene3009SymbolEdges::hide() {
-	_surface->setVisible(false);
+	setVisible(false);
 	StaticSprite::update();
 	_blinkCountdown = 0;
 }
 
 void SsScene3009SymbolEdges::startBlinking() {
-	_surface->setVisible(true);
+	setVisible(true);
 	StaticSprite::update();
 	_blinkCountdown = 3;
 	_blinkToggle = true;
@@ -556,12 +556,12 @@ SsScene3009TargetLine::SsScene3009TargetLine(NeverhoodEngine *vm, int index)
 	_drawRect.y = 0;
 	_drawRect.width = _spriteResource.getDimensions().width;
 	_drawRect.height = _spriteResource.getDimensions().height;
-	_surface->setVisible(false);
+	setVisible(false);
 	_needRefresh = true;
 }
 
 void SsScene3009TargetLine::show() {
-	_surface->setVisible(true);
+	setVisible(true);
 	StaticSprite::update();
 }
 
@@ -589,7 +589,7 @@ SsScene3009SymbolArrow::SsScene3009SymbolArrow(NeverhoodEngine *vm, Sprite *asSy
 
 void SsScene3009SymbolArrow::hide() {
 	_enabled = false;
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void SsScene3009SymbolArrow::update() {
@@ -633,14 +633,14 @@ AsScene3009VerticalIndicator::AsScene3009VerticalIndicator(NeverhoodEngine *vm,
 	createSurface1(0xC2463913, 1200);
 	_needRefresh = true;
 	updatePosition();
-	_surface->setVisible(false);
+	setVisible(false);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsScene3009VerticalIndicator::handleMessage);
 }
 
 void AsScene3009VerticalIndicator::show() {
 	setFileHash(0xC2463913, 0, -1);
-	_surface->setVisible(true);
+	setVisible(true);
 	updatePosition();
 	_enabled = true;
 }
@@ -666,7 +666,7 @@ AsScene3009HorizontalIndicator::AsScene3009HorizontalIndicator(NeverhoodEngine *
 	createSurface1(0xC0C12954, 1200);
 	_needRefresh = true;
 	updatePosition();
-	_surface->setVisible(false);
+	setVisible(false);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsScene3009HorizontalIndicator::handleMessage);
 	if (varValue == 8 || varValue == 9 || varValue == 10) {
@@ -706,7 +706,7 @@ void AsScene3009HorizontalIndicator::suMoveRight() {
 
 void AsScene3009HorizontalIndicator::show() {
 	setFileHash(0xC0C12954, 0, -1);
-	_surface->setVisible(true);
+	setVisible(true);
 	updatePosition();
 	_enabled = true;
 }
@@ -1105,12 +1105,12 @@ void SsScene3010DeadBoltButton::update() {
 
 	if (_countdown1 != 0 && (--_countdown1 == 0)) {
 		_soundResource1.play();
-		_surface->setVisible(false);
+		setVisible(false);
 		setSprite(kScene3010DeadBoltButtonFileHashes1[_buttonIndex]);
 	}
 
 	if (_countdown2 != 0 && (--_countdown2 == 0)) {
-		_surface->setVisible(true);
+		setVisible(true);
 		setSprite(kScene3010DeadBoltButtonFileHashes2[_buttonIndex]);
 	}
 
@@ -1124,7 +1124,7 @@ uint32 SsScene3010DeadBoltButton::handleMessage(int messageNum, const MessagePar
 			if (_buttonEnabled) {
 				_soundResource2.play();
 				_soundResource3.play();
-				_surface->setVisible(true);
+				setVisible(true);
 				_buttonLocked = true;
 				sendMessage(_parentScene, 0x2000, _buttonIndex);
 			} else {
@@ -1142,7 +1142,7 @@ uint32 SsScene3010DeadBoltButton::handleMessage(int messageNum, const MessagePar
 void SsScene3010DeadBoltButton::disableButton() {
 	_buttonLocked = true;
 	setSprite(kScene3010DeadBoltButtonFileHashes1[_buttonIndex]);
-	_surface->setVisible(true);
+	setVisible(true);
 }
 
 void SsScene3010DeadBoltButton::setSprite(uint32 fileHash) {
@@ -1185,7 +1185,7 @@ AsScene3010DeadBolt::AsScene3010DeadBolt(NeverhoodEngine *vm, Scene *parentScene
 		_soundResource2.load(0x420073DC);
 	}
 	
-	_surface->setVisible(false);
+	setVisible(false);
 	stIdle();
 	if (initUnlocked)
 		unlock(true);
@@ -1222,7 +1222,7 @@ void AsScene3010DeadBolt::stIdle() {
 
 void AsScene3010DeadBolt::unlock(bool skipAnim) {
 	if (!_unlocked) {
-		_surface->setVisible(true);
+		setVisible(true);
 		if (skipAnim) {
 			setFileHash(kAsScene3010DeadBoltFileHashes1[_boltIndex], -1, 0);
 			_newHashListIndex = -2;
@@ -1247,7 +1247,7 @@ void AsScene3010DeadBolt::stIdleMessage() {
 void AsScene3010DeadBolt::lock() {
 	if (!_locked) {
 		_locked = true;
-		_surface->setVisible(true);
+		setVisible(true);
 		setFileHash(kAsScene3010DeadBoltFileHashes2[_boltIndex], 0, -1);
 		SetMessageHandler(&AsScene3010DeadBolt::hmAnimation);
 		setCallback1(AnimationCallback(&AsScene3010DeadBolt::stDisabledMessage));
@@ -1266,7 +1266,7 @@ void AsScene3010DeadBolt::setCountdown(int count) {
 }
 
 void AsScene3010DeadBolt::stDisabled() {
-	_surface->setVisible(true);
+	setVisible(true);
 	setFileHash(kAsScene3010DeadBoltFileHashes1[_boltIndex], 0, -1);
 	SetMessageHandler(&AsScene3010DeadBolt::hmAnimation);
 	setCallback1(AnimationCallback(&AsScene3010DeadBolt::stDisabledMessage));
@@ -1276,7 +1276,7 @@ void AsScene3010DeadBolt::stDisabled() {
 }
 
 void AsScene3010DeadBolt::stDisabledMessage() {
-	_surface->setVisible(false);
+	setVisible(false);
 	sendMessage(_parentScene, 0x2003, _boltIndex);
 }
 
@@ -1447,7 +1447,7 @@ SsScene3011Button::SsScene3011Button(NeverhoodEngine *vm, Scene *parentScene, bo
 	_deltaRect.y = 0;
 	_deltaRect.width = _spriteResource.getDimensions().width;
 	_deltaRect.height = _spriteResource.getDimensions().height;
-	_surface->setVisible(false);
+	setVisible(false);
 	processDelta();
 	_needRefresh = true;
 	SetUpdateHandler(&SsScene3011Button::update);
@@ -1457,7 +1457,7 @@ SsScene3011Button::SsScene3011Button(NeverhoodEngine *vm, Scene *parentScene, bo
 void SsScene3011Button::update() {
 	StaticSprite::update();
 	if (_countdown != 0 && (--_countdown == 0)) {
-		_surface->setVisible(false);
+		setVisible(false);
 	}
 }
 
@@ -1467,7 +1467,7 @@ uint32 SsScene3011Button::handleMessage(int messageNum, const MessageParam &para
 	switch (messageNum) {
 	case 0x1011:
 		if (_countdown == 0) {
-			_surface->setVisible(true);
+			setVisible(true);
 			_countdown = 4;
 			sendMessage(_parentScene, 0x2000, 0);
 			_soundResource.play();
@@ -1496,7 +1496,7 @@ AsScene3011Symbol::AsScene3011Symbol(NeverhoodEngine *vm, int index, bool flag)
 		_soundResource1.load(0x64428609);
 		_soundResource2.load(0x7080023B);
 	}
-	_surface->setVisible(false);
+	setVisible(false);
 	_needRefresh = true;
 	SetUpdateHandler(&AnimatedSprite::update);
 }
@@ -1504,7 +1504,7 @@ AsScene3011Symbol::AsScene3011Symbol(NeverhoodEngine *vm, int index, bool flag)
 void AsScene3011Symbol::show(bool flag) {
 	_flag2 = flag;
 	setFileHash(kAsScene3011SymbolFileHashes[_index], 0, -1);
-	_surface->setVisible(true);
+	setVisible(true);
 	if (flag) {
 		_soundResource2.play();
 	} else {
@@ -1514,7 +1514,7 @@ void AsScene3011Symbol::show(bool flag) {
 
 void AsScene3011Symbol::hide() {
 	setFileHash1();
-	_surface->setVisible(false);
+	setVisible(false);
 }
 
 void AsScene3011Symbol::stopSound() {
@@ -1529,7 +1529,7 @@ void AsScene3011Symbol::change(int index, bool flag) {
 	_index = index;
 	_flag2 = flag;
 	setFileHash(kAsScene3011SymbolFileHashes[_index], 0, -1);
-	_surface->setVisible(true);
+	setVisible(true);
 	if (flag) {
 		_soundResource2.play();
 	} else {
diff --git a/engines/neverhood/sprite.h b/engines/neverhood/sprite.h
index f17b2d4216..1c4008e911 100644
--- a/engines/neverhood/sprite.h
+++ b/engines/neverhood/sprite.h
@@ -57,6 +57,7 @@ public:
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 	void loadDataResource(uint32 fileHash);
 	int16 defFilterY(int16 y);
+	void setVisible(bool value) { _surface->setVisible(value); }
 protected:
 	void (Sprite::*_spriteUpdateCb)();
 	Common::String _spriteUpdateCbName; // For debugging purposes