NEVERHOOD: Remove Scene::_surfaceFlag which also is obsolete now

22 files changed, 1 insertions, 99 deletions

diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp
index d69182b57e..0371903e31 100644
--- a/engines/neverhood/diskplayerscene.cpp
+++ b/engines/neverhood/diskplayerscene.cpp
@@ -334,8 +334,6 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int
 
 	int availableDisksCount = 0;
 	
-	_surfaceFlag = true;
-
 	setBackground(0x8A000044);
 	setPalette(kDiskplayerPaletteFileHashes[paletteIndex]);
 
diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 461f8738d4..8e6b56b9f0 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -339,7 +339,6 @@ Scene1001::Scene1001(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetMessageHandler(&Scene1001::handleMessage);
 	
 	setHitRects(0x004B4860);
-	_surfaceFlag = false;
 	setBackground(0x4086520E);
 	setPalette(0x4086520E);
 	insertMouse433(0x6520A400);
@@ -1279,8 +1278,6 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	setHitRects(0x004B4138);
 
-	_surfaceFlag = true;
-
 	setBackground(0x12C23307);
 	setPalette(0x12C23307);
 
@@ -1530,8 +1527,6 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam &param, Entit
 StaticScene::StaticScene(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash)
 	: Scene(vm, parentModule, true) {
 
-	_surfaceFlag = false;
-
 	SetMessageHandler(&StaticScene::handleMessage);
 	
 	setBackground(backgroundFileHash);
@@ -1588,8 +1583,6 @@ Scene1004::Scene1004(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 	
-	_surfaceFlag = true;
-	
 	SetUpdateHandler(&Scene1004::update);
 	SetMessageHandler(&Scene1004::handleMessage);
 
@@ -1687,8 +1680,6 @@ Scene1005::Scene1005(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	SetMessageHandler(&Scene1005::handleMessage);
 
-	_surfaceFlag = true;
-	
 	if (getGlobalVar(V_ENTRANCE_OPEN)) {
 		setBackground(0x2800E011);
 		setPalette(0x2800E011);
diff --git a/engines/neverhood/module1100.cpp b/engines/neverhood/module1100.cpp
index b825ced051..9bd7b8887a 100644
--- a/engines/neverhood/module1100.cpp
+++ b/engines/neverhood/module1100.cpp
@@ -452,7 +452,6 @@ Scene1105::Scene1105(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	_vm->gameModule()->initScene1405Vars();
 	
-	_surfaceFlag = true;
 	SetUpdateHandler(&Scene1105::update);
 	SetMessageHandler(&Scene1105::handleMessage);
 	
@@ -668,7 +667,6 @@ void Scene1105::update() {
 Scene1109::Scene1109(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, which) {
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1109::handleMessage);
 	
 	setBackground(0x8449E02F);
diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp
index fecb66a3b6..c0bab71f52 100644
--- a/engines/neverhood/module1200.cpp
+++ b/engines/neverhood/module1200.cpp
@@ -726,8 +726,6 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	setHitRects(0x004AEBD0);
 	
-	_surfaceFlag = true;
-
 	if (!getSubVar(VA_IS_PUZZLE_INIT, 0xE8058B52)) {
 		setSubVar(VA_IS_PUZZLE_INIT, 0xE8058B52, 1);
 		for (uint32 index = 0; index < 18; index++) {
@@ -1091,8 +1089,6 @@ Scene1202::Scene1202(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetMessageHandler(&Scene1202::handleMessage);
 	SetUpdateHandler(&Scene1202::update);
 
-	_surfaceFlag = true;
-
 	setBackground(0x60210ED5);
 
 	setPalette(0x60210ED5);
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp
index 3f606e7e4b..f718d1efe9 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/module1300.cpp
@@ -630,7 +630,6 @@ void AsScene1303Balloon::stPopBalloon() {
 Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1303::handleMessage);
 	setRectList(0x004AF9E8);
 	
@@ -694,7 +693,6 @@ uint32 AsScene1304Needle::handleMessage(int messageNum, const MessageParam &para
 Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1304::handleMessage);
 	setRectList(0x004B91A8);
 
@@ -761,7 +759,6 @@ uint32 Scene1304::handleMessage(int messageNum, const MessageParam &param, Entit
 Scene1305::Scene1305(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1305::handleMessage);
 	setRectList(0x004B6E98);
 
@@ -876,7 +873,6 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
 	if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
 		setGlobalVar(V_KEY3_LOCATION, 4);
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1306::handleMessage);
 
 	setBackground(0x05303114);
@@ -1275,7 +1271,6 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule, int which)
 		_keyHoleRects[i].y2 = pt.y + 15;
 	}
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1307::handleMessage);
 	SetUpdateHandler(&Scene1307::update);
 
@@ -1575,7 +1570,6 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	_vm->gameModule()->initScene1307Vars();
 
-	_surfaceFlag = true;		
 	SetMessageHandler(&Scene1308::handleMessage);
 	
 	setBackground(0x41024202);
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp
index e4e2550967..1bb0548fd4 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/module1400.cpp
@@ -647,7 +647,6 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetMessageHandler(&Scene1401::handleMessage);
 	SetUpdateHandler(&Scene1401::update);
 	setRectList(0x004B6758);
-	_surfaceFlag = true;
 
 	setBackground(0x08221FA5);
 	setPalette(0x08221FA5);
@@ -1243,8 +1242,6 @@ void AsScene1407Mouse::stArriveAtHole() {
 Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _puzzleSolvedCountdown(0),	_resetButtonCountdown(0) {
 
-	_surfaceFlag = true;
-
 	SetMessageHandler(&Scene1407::handleMessage);
 	SetUpdateHandler(&Scene1407::update);
 
@@ -1307,7 +1304,6 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetMessageHandler(&Scene1403::handleMessage);
 	
 	setRectList(0x004B1FF8);
-	_surfaceFlag = true;
 
 	setBackground(0x2110A234);
 	setPalette(0x2110A234);
@@ -1418,7 +1414,6 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which)
 		setGlobalVar(V_KEY3_LOCATION, 5);
 	
 	SetMessageHandler(&Scene1404::handleMessage);
-	_surfaceFlag = true;
 
 	setRectList(0x004B8D80);
 
@@ -1590,7 +1585,6 @@ Scene1405::Scene1405(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _selectFirstTile(true), _tilesLeft(48), _countdown(0) {
 
 	_vm->gameModule()->initScene1405Vars();
-	_surfaceFlag = true;
 	
 	setBackground(0x0C0C007D);
 	setPalette(0x0C0C007D);
diff --git a/engines/neverhood/module1500.cpp b/engines/neverhood/module1500.cpp
index b62ff01494..0b55209b9f 100644
--- a/engines/neverhood/module1500.cpp
+++ b/engines/neverhood/module1500.cpp
@@ -88,8 +88,6 @@ Scene1501::Scene1501(NeverhoodEngine *vm, Module *parentModule, uint32 backgroun
 	SetUpdateHandler(&Scene1501::update);
 	SetMessageHandler(&Scene1501::handleMessage);
 	
-	_surfaceFlag = true;
-
 	setBackground(backgroundFileHash);
 
 	setPalette();
diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/module1600.cpp
index a69b8d0140..382aedde38 100644
--- a/engines/neverhood/module1600.cpp
+++ b/engines/neverhood/module1600.cpp
@@ -1076,7 +1076,6 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	setGlobalVar(V_CAR_DELTA_X, 1);
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1608::hmLowerFloor);
 	
 	_asKey = insertSprite<AsCommonKey>(this, 1, 1100, 198, 220);
@@ -1396,7 +1395,6 @@ Scene1609::Scene1609(NeverhoodEngine *vm, Module *parentModule, int which)
 	// TODO _vm->gameModule()->initScene3011Vars();
 	_noisySymbolIndex = getGlobalVar(V_NOISY_SYMBOL_INDEX);
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene1609::handleMessage);
 	SetUpdateHandler(&Scene1609::update);
 	
diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/module1700.cpp
index adbd853664..ae97c151f7 100644
--- a/engines/neverhood/module1700.cpp
+++ b/engines/neverhood/module1700.cpp
@@ -194,8 +194,6 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	setHitRects(0x004B69D8);
 
-	_surfaceFlag = true;
-
 	setBackground(0x03118226);
 
 	setPalette(0x03118226);
diff --git a/engines/neverhood/module1900.cpp b/engines/neverhood/module1900.cpp
index 9db150338a..c4a0904232 100644
--- a/engines/neverhood/module1900.cpp
+++ b/engines/neverhood/module1900.cpp
@@ -91,8 +91,6 @@ Scene1901::Scene1901(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	Sprite *tempSprite;
 
-	_surfaceFlag = true;
-	
 	setRectList(0x004B34C8);
 
 	setBackground(0x01303227);
@@ -559,7 +557,6 @@ Scene1907::Scene1907(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _currMovingSymbolIndex(0), _pluggedInCount(0), 
 	_moveDownCountdown(0), _moveUpCountdown(0), _countdown3(0), _hasPlugInFailed(false) {
 	
-	_surfaceFlag = true;
 	setBackground(0x20628E05);
 	setPalette(0x20628E05);
 
diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/module2000.cpp
index bd5597dbf8..a97cbaa1ae 100644
--- a/engines/neverhood/module2000.cpp
+++ b/engines/neverhood/module2000.cpp
@@ -100,7 +100,6 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2001::handleMessage);
 
 	setBackground(0xA6417244);
diff --git a/engines/neverhood/module2100.cpp b/engines/neverhood/module2100.cpp
index 950b64d229..58f87d9afb 100644
--- a/engines/neverhood/module2100.cpp
+++ b/engines/neverhood/module2100.cpp
@@ -203,7 +203,6 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	Sprite *tempSprite;
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2101::handleMessage);
 	SetUpdateHandler(&Scene2101::update);
 	
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index 1b07890156..1159c0b1da 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -508,7 +508,6 @@ Scene2201::Scene2201(NeverhoodEngine *vm, Module *parentModule, int which)
 		// TODO _vm->gameModule()->initScene2201Vars();
 	}
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2201::handleMessage);
 	SetUpdateHandler(&Scene2201::update);
 	
@@ -892,8 +891,6 @@ Scene2202::Scene2202(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetMessageHandler(&Scene2202::handleMessage);
 	SetUpdateHandler(&Scene2202::update);
 
-	_surfaceFlag = true;
-
 	setBackground(0x08100A0C);
 	setPalette(0x08100A0C);
 	addEntity(_palette);
@@ -1115,7 +1112,6 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which)
 		setGlobalVar(V_KEY3_LOCATION, 1);
 
 	SetMessageHandler(&Scene2203::handleMessage);
-	_surfaceFlag = true;
 
 	setBackground(0x82C80334);
 	setPalette(0x82C80334);
@@ -1268,7 +1264,6 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which)
 	SetUpdateHandler(&Scene2205::update);
 	
 	setHitRects(0x004B0620);
-	_surfaceFlag = true;
 
 	if (getGlobalVar(V_LIGHTS_ON)) {
 		_isLightOn = true;
@@ -1520,7 +1515,6 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	SetUpdateHandler(&Scene::update);
 	SetMessageHandler(&Scene2206::handleMessage);
-	_surfaceFlag = true;
 	
 	if (getGlobalVar(V_LIGHTS_ON)) {
 		fileHash = 0x41983216;
@@ -2016,7 +2010,6 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	SetMessageHandler(&Scene2207::handleMessage);
 	SetUpdateHandler(&Scene2207::update);
-	_surfaceFlag = true;
 
 	insertKlayman<KmScene2207>(0, 0);
 	_klayman->setRepl(64, 0);
@@ -2405,7 +2398,6 @@ static const uint32 kScene2242MessageListIds1[] = {
 Scene2242::Scene2242(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _isKlaymanInLight(false) {
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2242::handleMessage);
 	SetUpdateHandler(&Scene2242::update);
 	
@@ -2525,7 +2517,6 @@ HallOfRecordsScene::HallOfRecordsScene(NeverhoodEngine *vm, Module *parentModule
 	
 	_sceneInfo140 = _vm->_staticData->getSceneInfo140Item(sceneInfo140Id);
 
-	_surfaceFlag = true;
 	SetMessageHandler(&HallOfRecordsScene::handleMessage);
 	SetUpdateHandler(&Scene::update);
 
@@ -2617,7 +2608,6 @@ Scene2247::Scene2247(NeverhoodEngine *vm, Module *parentModule, int which)
 	//DEBUG
 	setGlobalVar(V_LIGHTS_ON, 1);
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2247::handleMessage);
 	SetUpdateHandler(&Scene::update);
 
diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp
index f791c8ea13..94937bf874 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/module2400.cpp
@@ -392,7 +392,6 @@ Scene2401::Scene2401(NeverhoodEngine *vm, Module *parentModule, int which)
 	setGlobalVar(V_WATER_RUNNING, 1); //DEBUG! Enables water
 	setGlobalVar(V_HAS_TEST_TUBE, 1); //DEBUG! Gives the test tube
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2401::handleMessage);
 	SetUpdateHandler(&Scene2401::update);
 
@@ -721,7 +720,6 @@ Scene2402::Scene2402(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2402::handleMessage);
 	SetUpdateHandler(&Scene2402::update);
 
@@ -825,7 +823,6 @@ Scene2403::Scene2403(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	Sprite *tempSprite1, *tempSprite2, *tempSprite3;
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2403::handleMessage);
 	setBackground(0x0C05060C);
 	setPalette(0x0C05060C);
@@ -922,7 +919,6 @@ Scene2406::Scene2406(NeverhoodEngine *vm, Module *parentModule, int which)
 	if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
 		setGlobalVar(V_KEY3_LOCATION, 2);
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2406::handleMessage);
 	
 	setRectList(0x004B78C8);
diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp
index c9bffe527e..19779c3234 100644
--- a/engines/neverhood/module2500.cpp
+++ b/engines/neverhood/module2500.cpp
@@ -227,7 +227,6 @@ Scene2501::Scene2501(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	setGlobalVar(V_CAR_DELTA_X, 1);
 	SetUpdateHandler(&Scene2501::update);
-	_surfaceFlag = true;
 	setBackground(0x1B8E8115);
 	setPalette(0x1B8E8115);
 	_palette->addPalette(0x00128842, 65, 31, 65);
@@ -551,7 +550,6 @@ Scene2504::Scene2504(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	Sprite *ssButton;
 	
-	_surfaceFlag = true;
 	setBackground(0x90791B80);
 	setPalette(0x90791B80);
 	ssButton = insertSprite<SsScene2504Button>();
diff --git a/engines/neverhood/module2600.cpp b/engines/neverhood/module2600.cpp
index 6eebd403f8..37e4406205 100644
--- a/engines/neverhood/module2600.cpp
+++ b/engines/neverhood/module2600.cpp
@@ -306,7 +306,6 @@ uint32 AsScene2609Water::handleMessage(int messageNum, const MessageParam &param
 Scene2609::Scene2609(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _isBusy(false) {
 	
-	_surfaceFlag = true;
 	setBackground(0x51409A16);
 	setPalette(0x51409A16);
 	_asWater = insertSprite<AsScene2609Water>();
diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
index 9ff0da1424..870c14ced4 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/module2700.cpp
@@ -592,8 +592,6 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which)
 	SceneInfo2700 *sceneInfo = _vm->_staticData->getSceneInfo2700(0x004B2240);
 	setGlobalVar(V_CAR_DELTA_X, 1);
 	
-	_surfaceFlag = true;
-	
 	setBackground(sceneInfo->bgFilename);
 	setPalette(sceneInfo->bgFilename);
 
@@ -705,7 +703,6 @@ Scene2702::Scene2702(NeverhoodEngine *vm, Module *parentModule, int which)
 		for (int j = 0; j < 3; j++)
 			_sceneInfos[i][j] = _vm->_staticData->getSceneInfo2700(kScene2702Infos[i][j]);
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2702::handleMessage);
 	SetUpdateHandler(&Scene2702::update);
 	
@@ -875,7 +872,6 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3
 
 	SceneInfo2700 *sceneInfo = _vm->_staticData->getSceneInfo2700(sceneInfoId);
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2704::handleMessage);
 	SetUpdateHandler(&Scene2704::update);
 	
@@ -988,7 +984,6 @@ static const struct { const char *pointListName; int which1, which2; } kSceneInf
 Scene2706::Scene2706(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _newTrackIndex(-1) {
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2706::handleMessage);
 	
 	setBackground(0x18808B88);
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp
index 140e1125c2..c1e1790040 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/module2800.cpp
@@ -404,7 +404,6 @@ Scene2801::Scene2801(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	_vm->gameModule()->initScene2801Vars();
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2801::handleMessage);
 	SetUpdateHandler(&Scene::update);
 
@@ -512,7 +511,6 @@ Scene2802::Scene2802(NeverhoodEngine *vm, Module *parentModule, int which)
 	setGlobalVar(V_RADIO_MOVE_DISH_VIDEO, 0);
 	//DEBUG<<<
 		
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2802::handleMessage);
 	SetUpdateHandler(&Scene2802::update);
 	insertMouse435(0x008810A8, 20, 620);
@@ -843,8 +841,6 @@ Scene2803::Scene2803(NeverhoodEngine *vm, Module *parentModule, int which)
 	
 	loadDataResource(0x00900849);
 	
-	_surfaceFlag = true;
-
 	_background = new Background(_vm, 0);
 	_background->createSurface(0, 640, 480);
 	addBackground(_background);
@@ -1126,7 +1122,6 @@ Scene2803Small::Scene2803Small(NeverhoodEngine *vm, Module *parentModule, int wh
 		0, 0x286800D4, 0x286806D4, 0x28680AD4
 	};
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2803Small::handleMessage);
 
 	loadDataResource(0x81120132);
@@ -1818,7 +1813,6 @@ Scene2804::Scene2804(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	initCrystalColors();
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2804::handleMessage);
 	SetUpdateHandler(&Scene2804::update);
 
@@ -1969,7 +1963,6 @@ void Scene2804::initCrystalColors() {
 Scene2805::Scene2805(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2805::handleMessage);
 
 	setBackground(0x08021E04);
@@ -2058,7 +2051,6 @@ Scene2806::Scene2806(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2806::handleMessage);
 	SetUpdateHandler(&Scene2806::update);
 	
@@ -2178,7 +2170,6 @@ void Scene2806::findClosestPoint() {
 Scene2807::Scene2807(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2807::handleMessage);
 
 	if (getSubVar(VA_GOOD_TEST_TUBES_LEVEL_1, 0) == 1) {
@@ -2205,7 +2196,6 @@ Scene2807::Scene2807(NeverhoodEngine *vm, Module *parentModule, int which)
 		insertStaticSprite(0x31203460, 100);
 	}
 
-	_surfaceFlag = true;
 	setBackground(0x3E049A95);
 	setPalette(0x3E049A95);
 	insertMouse435(0x49A913E8, 20, 620);
@@ -2536,7 +2526,6 @@ Scene2808::Scene2808(NeverhoodEngine *vm, Module *parentModule, int which)
 		_vm->gameModule()->initScene2808Vars2();
 	}
 	
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2808::handleMessage);
 	SetUpdateHandler(&Scene2808::update);
 
@@ -2661,7 +2650,6 @@ Scene2809::Scene2809(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 		
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2809::handleMessage);
 	SetUpdateHandler(&Scene2809::update);
 	
@@ -2809,7 +2797,6 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2810::handleMessage);
 	
 	setBackground(0x26508804);
@@ -3127,7 +3114,6 @@ Scene2812::Scene2812(NeverhoodEngine *vm, Module *parentModule, int which)
 	if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
 		setGlobalVar(V_KEY3_LOCATION, 3);
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene2812::handleMessage);
 	SetUpdateHandler(&Scene2812::update);
 	
diff --git a/engines/neverhood/module2900.cpp b/engines/neverhood/module2900.cpp
index 0a033a8120..976cf5d9f6 100644
--- a/engines/neverhood/module2900.cpp
+++ b/engines/neverhood/module2900.cpp
@@ -401,7 +401,6 @@ Scene2901::Scene2901(NeverhoodEngine *vm, Module *parentModule, int which)
 	if (_currLocationButtonNum == 3)
 		setSubVar(V_TELEPORTER_DEST_AVAILABLE, 2, 1);
 
-	_surfaceFlag = true;
 	setBackground(kScene2901FileHashes1[_currLocationButtonNum]);
 	setPalette(kScene2901FileHashes1[_currLocationButtonNum]);
 	
diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp
index 6d394a859f..c3eb9e458d 100644
--- a/engines/neverhood/module3000.cpp
+++ b/engines/neverhood/module3000.cpp
@@ -805,7 +805,6 @@ Scene3009::Scene3009(NeverhoodEngine *vm, Module *parentModule, int which)
 	_vm->gameModule()->initScene3009Vars();
 	
 	setGlobalVar(V_CANNON_SMACKER_NAME, 0);
-	_surfaceFlag = true;
 	
 	_vm->_screen->clear();
 	
@@ -1293,8 +1292,6 @@ Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which)
 	setSubVar(VA_LOCKS_DISABLED, kScene3010ButtonNameHashes[1], 1);
 	setSubVar(VA_LOCKS_DISABLED, kScene3010ButtonNameHashes[2], 1);
 
-	_surfaceFlag = true;
-
 	setBackground(0x80802626);
 	setPalette(0x80802626);
 
@@ -1533,7 +1530,6 @@ Scene3011::Scene3011(NeverhoodEngine *vm, Module *parentModule, int which)
 	// TODO _vm->gameModule()->initScene3011Vars();
 	_noisySymbolIndex = getGlobalVar(V_NOISY_SYMBOL_INDEX);
 
-	_surfaceFlag = true;
 	SetMessageHandler(&Scene3011::handleMessage);
 	SetUpdateHandler(&Scene3011::update);
 	
diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
index c706ecc5dc..ac08c1483f 100644
--- a/engines/neverhood/scene.cpp
+++ b/engines/neverhood/scene.cpp
@@ -48,7 +48,6 @@ Scene::Scene(NeverhoodEngine *vm, Module *parentModule, bool clearHitRects)
 	_vm->_screen->setSmackerDecoder(NULL);
 	// TODO g_screen->resetDirtyRects();	
 	_canAcceptInput = true;
-	_surfaceFlag = false;
 	_messageList2 = NULL;
 	_smackerPlayer = NULL;
 	_isMessageListBusy = false;
@@ -75,25 +74,11 @@ Scene::~Scene() {
 
 void Scene::draw() {
 	if (_smackerPlayer) {
-		if (_surfaceFlag) {
-			// TODO g_screen->resetDirtyRects();
-			// TODO g_screen->copyDirtyRects();
-			// TODO g_screen->addDirtyRects();
-		}
 		if (_smackerPlayer->getSurface())
 			_smackerPlayer->getSurface()->draw();
 	} else {
-#if 0	
-		if (_surfaceFlag) {
-			// TODO g_screen->copyDirtyRects();
-			for (Common::Array<BaseSurface*>::iterator iter = _surfaces.begin(); iter != _surfaces.end(); iter++)
-				(*iter)->addDirtyRect();
-			// TODO g_screen->addDirtyRects();
-		}
-#endif		
-		for (Common::Array<BaseSurface*>::iterator iter = _surfaces.begin(); iter != _surfaces.end(); iter++) {
+		for (Common::Array<BaseSurface*>::iterator iter = _surfaces.begin(); iter != _surfaces.end(); iter++)
 			(*iter)->draw();
-		}
 	}	
 }
 
diff --git a/engines/neverhood/scene.h b/engines/neverhood/scene.h
index 11c00d9e3c..c9e27f7bb4 100644
--- a/engines/neverhood/scene.h
+++ b/engines/neverhood/scene.h
@@ -160,8 +160,6 @@ protected:
 	Common::Array<Entity*> _entities;
 	Common::Array<BaseSurface*> _surfaces;
 
-	bool _surfaceFlag;
-
 	Klayman *_klayman;
 	Background *_background;
 	Palette *_palette;