NEVERHOOD: Remove obsolete TODOs

5 files changed, 1 insertions, 14 deletions

diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index 9f5f7fb9ee..ebe0f81291 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -2170,9 +2170,6 @@ Scene2208::Scene2208(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	_background->getSurface()->getSysRect().y = _backgroundScrollY;
 
-	// TODO Screen.yOffset = _backgroundScrollY;
-	// TODO Scene2208_sub409080 (creates background Sprites via the text, doesn't seem to be used?)
-
 }
 
 Scene2208::~Scene2208() {
@@ -2219,7 +2216,6 @@ void Scene2208::update() {
 		_background->getSurface()->getSysRect().y = _backgroundScrollY;
 	}
 
-	// TODO Screen.yOffset = _backgroundScrollY;
 	Scene::update();
 
 }
diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp
index 4aefbfb8a9..ba5b140767 100644
--- a/engines/neverhood/module2500.cpp
+++ b/engines/neverhood/module2500.cpp
@@ -25,8 +25,6 @@
 
 namespace Neverhood {
 
-// TODO Maybe move these to the DAT
-
 static const uint32 kScene2505StaticSprites[] = {
 	0x4000A226, 0
 };
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp
index 214e65e62e..dd02d59a6d 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/module2800.cpp
@@ -1667,7 +1667,6 @@ uint32 AsScene2804BeamCoil::handleMessage(int messageNum, const MessageParam &pa
 	
 void AsScene2804BeamCoil::show() {
 	_ssBeamCoilBody->setVisible(true);
-	// TODO _ssBeamCoilBody->updatePosition(); -> show()
 	setVisible(true);
 	startAnimation(0x00494891, 0, -1);
 	playSound(0);
@@ -1680,7 +1679,6 @@ void AsScene2804BeamCoil::hide() {
 	SetMessageHandler(&AsScene2804BeamCoil::handleMessage);
 	setVisible(false);
 	_ssBeamCoilBody->setVisible(false);
-	// TODO _ssBeamCoilBody->updatePosition(); -> hide()
 	_vm->_soundMan->stopSound(0xEF56B094);
 }
 
diff --git a/engines/neverhood/resource.cpp b/engines/neverhood/resource.cpp
index 3350b80e61..869bebbcfe 100644
--- a/engines/neverhood/resource.cpp
+++ b/engines/neverhood/resource.cpp
@@ -100,11 +100,8 @@ void PaletteResource::unload() {
 }
 
 void PaletteResource::copyPalette(byte *destPalette) {
-	if (_palette) {
+	if (_palette)
 		memcpy(destPalette, _palette, 1024);
-	} else {
-		// TODO?: buildDefaultPalette(palette);
-	}
 }
 
 // AnimResource
diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index 13ac87fbad..d055107596 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -276,7 +276,6 @@ void SoundMan::setSoundVolume(uint32 soundFileHash, int volume) {
 }
 
 void SoundMan::update() {
-	// TODO Check if active
 	
 	for (uint i = 0; i < _soundItems.size(); ++i) {
 		SoundItem *soundItem = _soundItems[i];
@@ -548,7 +547,6 @@ void AudioResourceMan::loadSound(int16 soundIndex) {
 	AudioResourceManSoundItem *soundItem = _soundItems[soundIndex];
 	if (!soundItem->_data && soundItem->_resourceHandle.isValid() &&
 		(soundItem->_resourceHandle.type() == kResTypeSound || soundItem->_resourceHandle.type() == kResTypeMusic)) {
-		// TODO Check if it's a sound resource
 		_vm->_res->loadResource(soundItem->_resourceHandle);
 		soundItem->_data = soundItem->_resourceHandle.data();
 	}