Removed more obsolete TODO messages.

svn-id: r41956

7 files changed, 3 insertions, 18 deletions

diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 9453232865..9f42697ec7 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -87,7 +87,6 @@ int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 		}
 	}
 	_screen->updateScreen();
-	// XXX clearKyrandiaButtonIO
 	return 0;
 }
 
@@ -183,7 +182,6 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 		break;
 	}
 	_unkAmuletVar = 0;
-	// XXX clearKyrandiaButtonIO (!used before every return in this function!)
 	return 1;
 }
 
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 20fb0396d8..43523c0837 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -643,8 +643,6 @@ bool KyraEngine_HoF::handleInputUnkSub(int x, int y) {
 		while (_emc->isValid(&_sceneScriptState))
 			_emc->run(&_sceneScriptState);
 
-		//XXXsys_unkKeyboad (flush? wait? whatever...)
-
 		if (queryGameFlag(0x1ED)) {
 			_sound->beginFadeOut();
 			_screen->fadeToBlack();
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index a0f38c3acc..a905c5521b 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -113,7 +113,6 @@ public:
 	KyraEngine_LoK(OSystem *system, const GameFlags &flags);
 	~KyraEngine_LoK();
 
-	//TODO: proper extended implementation of KyraEngine_v1::pauseEngineIntern.
 	// _sprites and _seqplayer should be paused here too, to avoid some animation glitches,
 	// also parts of the hardcoded Malcolm fight might need some special handling.
 
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 6c06a84433..88bfb8c89b 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -50,7 +50,6 @@ public:
 	KyraEngine_MR(OSystem *system, const GameFlags &flags);
 	~KyraEngine_MR();
 
-	//TODO: proper extended implementation of KyraEngine_v2::pauseEngineIntern.
 	// Idle animation time, item animations and album animations should be taken
 	// care of, but since those would just produce minor glitches it's not that
 	// important.
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index 558d703f15..1800bd1939 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -381,13 +381,10 @@ int KyraEngine_MR::o3_checkInRect(EMCState *script) {
 		y += desc[1];
 	}
 
-	if (x >= x1 && x <= x2 && y >= y1 && y <= y2) {
-		//XXX
+	if (x >= x1 && x <= x2 && y >= y1 && y <= y2)
 		return 1;
-	} else {
-		//XXX
+	else
 		return 0;
-	}
 }
 
 int KyraEngine_MR::o3_updateConversations(EMCState *script) {
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index f798251525..451b77cec2 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -311,10 +311,8 @@ void MidiOutput::sendSysEx(const byte p1, const byte p2, const byte p3, const by
 }
 
 void MidiOutput::metaEvent(byte type, byte *data, uint16 length) {
-	if (type == 0x2F) { // End of Track
+	if (type == 0x2F) // End of Track
 		deinitSource(_curSource);
-		//XXX
-	}
 
 	_output->metaEvent(type, data, length);
 }
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp
index baae4547e5..3f4bfb65ac 100644
--- a/engines/kyra/text_lok.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -39,9 +39,6 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const
 	uint8 currPage;
 	Common::Event event;
 
-	//while (towns_isEscKeyPressed() )
-		//towns_getKey();
-
 	uint32 timeToEnd = strlen(chatStr) * 8 * _tickLength + _system->getMillis();
 
 	if (textEnabled() && !speechEnabled() && chatDuration != -1) {
@@ -136,7 +133,6 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const
 	_timer->enable(15);
 	_timer->enable(18);
 	_timer->enable(19);
-	//clearKyrandiaButtonIO();
 }
 
 void KyraEngine_LoK::endCharacterChat(int8 charNum, int16 convoInitialized) {