[Scummvm-cvs-logs] SF.net SVN: scummvm: [28892] scummvm/trunk/engines

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Sep 11 17:49:20 CEST 2007


Revision: 28892
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28892&view=rev
Author:   sev
Date:     2007-09-11 08:49:19 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
Remove/clarify several FIXMEs

Modified Paths:
--------------
    scummvm/trunk/engines/agi/loader_preagi.cpp
    scummvm/trunk/engines/agi/loader_v2.cpp
    scummvm/trunk/engines/agi/loader_v3.cpp
    scummvm/trunk/engines/agi/predictive.cpp
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/insane/insane.cpp
    scummvm/trunk/engines/scumm/insane/insane_scenes.cpp

Modified: scummvm/trunk/engines/agi/loader_preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_preagi.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/agi/loader_preagi.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -273,9 +273,7 @@
 
 		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;

Modified: scummvm/trunk/engines/agi/loader_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v2.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/agi/loader_v2.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -173,10 +173,6 @@
 				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;

Modified: scummvm/trunk/engines/agi/loader_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v3.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/agi/loader_v3.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -228,12 +228,6 @@
 		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]);

Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/agi/predictive.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -199,9 +199,8 @@
 					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;
 				}

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/scumm/charset.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -74,9 +74,7 @@
 			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) {

Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -1169,10 +1169,6 @@
 	_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;

Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp	2007-09-11 11:10:23 UTC (rev 28891)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp	2007-09-11 15:49:19 UTC (rev 28892)
@@ -171,9 +171,7 @@
 		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 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list