Remove/clarify several FIXMEs

svn-id: r28892

7 files changed, 5 insertions, 29 deletions

diff --git a/engines/agi/loader_preagi.cpp b/engines/agi/loader_preagi.cpp
index 7d155b961f..135472bca3 100644
--- a/engines/agi/loader_preagi.cpp
+++ b/engines/agi/loader_preagi.cpp
@@ -273,9 +273,7 @@ int AgiLoader_preagi::loadResource(int t, byte* n) {
 
 		if (n != NULL) {
 			_vm->_game.pictures[0].rdata = n;
-			// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-			// needs fixing, or remove it!
-			_vm->_game.dirPic[0].len = 4096;		//FIXME
+			_vm->_game.dirPic[0].len = 4096;		//FIXME: set up real resource length
 			_vm->_game.dirPic[0].flags |= RES_LOADED;
 		} else {
 			ec = errBadResource;
diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index 8131efbca1..c0c6df2fcb 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -173,10 +173,6 @@ uint8 *AgiLoader_v2::loadVolRes(struct AgiDir *agid) {
 				abort();
 			}
 		} else {
-#if 0
-			// FIXME: call some panic handler instead of deiniting directly
-			deinitVideoMode();
-#endif
 			report("Error: bad signature %04x\n", sig);
 			// fprintf (stderr, "ACK! BAD RESOURCE!!!\n");
 			return 0;
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index 8a3a7d2b29..65b9e6592b 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -228,12 +228,6 @@ uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) {
 		fp.read(&x, 7);
 
 		if (READ_BE_UINT16((uint8 *) x) != 0x1234) {
-#if 0
-			// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-			// needs fixing, or remove it!
-			/* FIXME */
-			deinitVideoMode();
-#endif
 			debugC(3, kDebugLevelResources, "path = %s", path.c_str());
 			debugC(3, kDebugLevelResources, "offset = %d", agid->offset);
 			debugC(3, kDebugLevelResources, "x = %x %x", x[0], x[1]);
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index 8da7f22889..5ffa3d159f 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -199,9 +199,8 @@ bool AgiEngine::predictiveDialog(void) {
 					color2 = 7;
 				}
 				
-				// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
 				// needs fixing, or remove it!
-				bool _addIsActive = false; // FIXME
+				bool _addIsActive = false; // FIXME: word adding is not implemented
 				if (i == 10 && !_addIsActive) { // Add
 					color2 = 7;
 				}
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 056eacd318..6eb6cfd7c6 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -74,9 +74,7 @@ void ScummEngine::loadCJKFont() {
 			break;
 		case Common::JA_JPN:
 			fontFile = (_game.id == GID_DIG) ? "kanji16.fnt" : "japanese.fnt";
-			// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-			// needs fixing, or remove it!
-			numChar = 1024; //FIXME
+			numChar = 1024; //FIXME: sev needs japanese font files to clarify font size
 			break;
 		case Common::ZH_TWN:
 			if (_game.id == GID_CMI) {
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 141f444403..af09daff96 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -1169,10 +1169,6 @@ int Insane::smlayer_loadCostume(int id, int phase) {
 	_vm->ensureResourceLoaded(rtCostume, resid);
 	_vm->_res->setResourceCounter(rtCostume, resid, 1);
 
-	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-	// needs fixing, or remove it!
-	// smlayer_lock(rtCostume, resid); // FIXME
-
 	if (phase == 1) {
 		_objArray1Idx2++;
 		_objArray1[_objArray1Idx2] = id;
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 24f80a92e2..0cf6623664 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -171,9 +171,7 @@ void Insane::runScene(int arraynum) {
 		writeArray(339, _enemy[EN_VULTF2].isEmpty);
 		writeArray(340, _enemy[EN_VULTM2].isEmpty);
 	}
-	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-	// needs fixing, or remove it!
-	// insane_unlock(); // FIXME
+
 	_vm->_sound->stopAllSounds(); // IMUSE_StopAllSounds();
 }
 
@@ -330,10 +328,7 @@ int Insane::loadSceneData(int scene, int flag, int phase) {
 	int retvalue = 1;
 
 	debugC(DEBUG_INSANE, "Insane::loadSceneData(%d, %d, %d)", scene, flag, phase);
-	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-	// needs fixing, or remove it!
-	//if (phase == 1) /// FIXME
-	//	insane_unlock();
+
 	switch (scene) {
 	case 1:
 		smlayer_loadSound(88, flag, phase);