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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Sep 11 11:20:39 CEST 2007


Revision: 28890
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28890&view=rev
Author:   fingolfin
Date:     2007-09-11 02:20:39 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/midi/quicktime.cpp
    scummvm/trunk/backends/platform/gp2x/gp2x-common.h
    scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
    scummvm/trunk/backends/platform/sdl/sdl.h
    scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp
    scummvm/trunk/base/main.cpp
    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/agi/sound.cpp
    scummvm/trunk/engines/agi/text.cpp
    scummvm/trunk/engines/engine.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/queen/cutaway.cpp
    scummvm/trunk/engines/scumm/actor.cpp
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/insane/insane.cpp
    scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
    scummvm/trunk/engines/scumm/object.cpp
    scummvm/trunk/engines/scumm/resource.cpp
    scummvm/trunk/engines/scumm/string.cpp
    scummvm/trunk/engines/scumm/verbs.cpp
    scummvm/trunk/gui/PopUpWidget.cpp
    scummvm/trunk/gui/editable.cpp
    scummvm/trunk/gui/message.cpp
    scummvm/trunk/sound/midiparser.h

Modified: scummvm/trunk/backends/midi/quicktime.cpp
===================================================================
--- scummvm/trunk/backends/midi/quicktime.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/midi/quicktime.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -38,7 +38,7 @@
 #endif
 
 
-// FIXME - the following disables reverb support in the QuickTime / CoreAudio
+// FIXME: the following disables reverb support in the QuickTime / CoreAudio
 // midi backends. For some reasons, reverb will suck away a *lot* of CPU time.
 // Until we know for sure what is causing this and if there is a better way to
 // fix the problem, we just disable all reverb for these backends.

Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h	2007-09-11 09:20:39 UTC (rev 28890)
@@ -165,7 +165,7 @@
 	void hideOverlay();
 	void clearOverlay();
 	void grabOverlay(OverlayColor *buf, int pitch);
-	void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); // WinCE FIXME
+	void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	int16 getHeight();
 	int16 getWidth();
 	int16 getOverlayHeight()  { return _overlayHeight; }

Modified: scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_file.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/platform/gp32/gp32std_file.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -224,6 +224,8 @@
 	stream->filePos += len;
 #endif
 
+	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+	// needs fixing, or remove it!
 	return 1; //readcount / size;	//FIXME
 }
 

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2007-09-11 09:20:39 UTC (rev 28890)
@@ -161,11 +161,11 @@
 	void deleteMutex(MutexRef mutex);
 
 	// Overlay
-	virtual void showOverlay(); // WinCE FIXME
-	virtual void hideOverlay(); // WinCE FIXME
+	virtual void showOverlay();
+	virtual void hideOverlay();
 	virtual void clearOverlay();
 	virtual void grabOverlay(OverlayColor *buf, int pitch);
-	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); // WinCE FIXME
+	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	virtual int16 getHeight();
 	virtual int16 getWidth();
 	virtual int16 getOverlayHeight()  { return _overlayHeight; }

Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -47,6 +47,8 @@
 	: Dialog(10, 60, 300, 77) {
 		char tempo[100];
 
+		// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+		// needs fixing, or remove it!
 		addButton(this,(_w - kButtonWidth) / 2, 45, "OK", kCloseCmd, '\r');	// Close dialog - FIXME
 
 		Common::String videoDriver("Using SDL driver ");

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -1099,6 +1099,8 @@
 
 	update_scalers();
 
+	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+	// needs fixing, or remove it!
 	// FIXME
 	if (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640) && mode)
 		_scaleFactorXm = -1;
@@ -1992,6 +1994,8 @@
 }
 
 void OSystem_WINCE3::drawMouse() {
+	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+	// needs fixing, or remove it!
 	// FIXME
 	if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset() && !_usesEmulatedMouse) && !_forceHideMouse)
 		internDrawMouse();		

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/base/main.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -101,7 +101,7 @@
 
 	// FIXME: Do we really need this one? 
 	printf("Trying to start game '%s'\n", game.description().c_str());
-
+	
 	return plugin;
 }
 

Modified: scummvm/trunk/engines/agi/loader_preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_preagi.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/loader_preagi.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -273,6 +273,8 @@
 
 		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].flags |= RES_LOADED;
 		} else {

Modified: scummvm/trunk/engines/agi/loader_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v2.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/loader_v2.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -174,9 +174,7 @@
 			}
 		} else {
 #if 0
-			/* FIXME: call some panic handler instead of
-			 *        deiniting directly
-			 */
+			// FIXME: call some panic handler instead of deiniting directly
 			deinitVideoMode();
 #endif
 			report("Error: bad signature %04x\n", sig);

Modified: scummvm/trunk/engines/agi/loader_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v3.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/loader_v3.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -229,6 +229,8 @@
 
 		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

Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/predictive.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -199,6 +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
 				if (i == 10 && !_addIsActive) { // Add
 					color2 = 7;

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/sound.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -823,6 +823,8 @@
 
 				p += (uint32) 118600 *4 / _chn[c].freq;
 
+				// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+				// needs fixing, or remove it!
 				/* FIXME */
 				if (_chn[c].flags & AGI_SOUND_LOOP) {
 					p %= _chn[c].size << 8;

Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/agi/text.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -67,6 +67,8 @@
 		for (m = (const unsigned char *)msg, x1 = y1 = 0; *m; m++) {
 
 			if (*m >= 0x20 || *m == 1 || *m == 2 || *m == 3) {
+				// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+				// needs fixing, or remove it!
 				/* FIXME */
 				int ypos;
 

Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/engine.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -43,7 +43,7 @@
 extern bool isSmartphone(void);
 #endif
 
-// FIXME - BIG HACK for MidiEmu & error()
+// FIXME: HACK for MidiEmu & error()
 Engine *g_engine = 0;
 
 

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -95,6 +95,8 @@
 Parallaction::Parallaction(OSystem *syst) :
 	Engine(syst) {
 
+	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
+	// needs fixing, or remove it!
 	// FIXME
 	_vm = this;
 

Modified: scummvm/trunk/engines/queen/cutaway.cpp
===================================================================
--- scummvm/trunk/engines/queen/cutaway.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/queen/cutaway.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -365,7 +365,7 @@
 
 	_vm->logic()->oldRoom(_initialRoom);
 
-	// FIXME - Cutaway c41f is played at the end of the command 0x178. This command
+	// FIXME: Cutaway c41f is played at the end of the command 0x178. This command
 	// setups some persons and associates bob slots to them. They should be hidden as
 	// their y coordinate is > 150, but they aren't ! As a workaround, we display the room
 	// with the panel area enabled. We do the same problem for cutaway c62c.

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/actor.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -523,7 +523,7 @@
 
 	if (_moving & MF_TURN) {
 		new_dir = updateActorDirection(false);
-		// FIXME -- is this correct?
+		// FIXME: is this correct?
 		if (_facing != new_dir)
 			setDirection(new_dir);
 		else
@@ -670,7 +670,7 @@
 	bool flipX;
 	bool flipY;
 
-	// FIXME - It seems that at least in The Dig the original code does
+	// FIXME: It seems that at least in The Dig the original code does
 	// check _ignoreBoxes here. However, it breaks some animations in Loom,
 	// causing Bobbin to face towards the camera instead of away from it
 	// in some places: After the tree has been destroyed by lightning, and
@@ -1902,7 +1902,7 @@
 
 	convertMessageToString(msg, _charsetBuffer, sizeof(_charsetBuffer));
 
-	// FIXME: Workaround for bugs #770039 and #770049
+	// WORKAROUND for bugs #770039 and #770049
 	if (_game.id == GID_LOOM) {
 		if (!*_charsetBuffer)
 			return;

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/charset.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -74,6 +74,8 @@
 			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
 			break;
 		case Common::ZH_TWN:

Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -1169,6 +1169,8 @@
 	_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) {

Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -171,6 +171,8 @@
 		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();
 }
@@ -328,6 +330,8 @@
 	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) {

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/object.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -1395,7 +1395,9 @@
 			if (id2 == (uint16)id) {
 				if (findWhat & foCodeHeader) {
 					fo->obcd = obcdptr;
-					fo->cdhd = (const CodeHeader *)(obcdptr + 10);	// TODO - FIXME
+					// We assume that the code header starts at a fixed offset.
+					// A bit hackish, but works reasonably well.
+					fo->cdhd = (const CodeHeader *)(obcdptr + 10);
 				}
 				if (findWhat & foImageHeader) {
 					fo->obim = obimptr;

Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/resource.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -597,7 +597,7 @@
 		i = _resourceMapper[i & 0x7F];
 	}
 
-	// FIXME - TODO: This check used to be "i==0". However, that causes
+	// FIXME: This check used to be "i==0". However, that causes
 	// problems when using this function to ensure charset 0 is loaded.
 	// This is done for many games, e.g. Zak256 or Indy3 (EGA and VGA).
 	// For now we restrict the check to anything which is not a charset.

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/string.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -586,7 +586,7 @@
 				_nextTop += _charset->getFontHeight();
 			}
 			if (_game.version > 3) {
-				// FIXME - is this really needed?
+				// FIXME: is this really needed?
 				_charset->_disableOffsX = true;
 			}
 			continue;

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -1014,8 +1014,8 @@
 	} else if (_game.features & GF_SMALL_HEADER) {
 		for (i = (_numLocalObjects-1); i > 0; i--) {
 			if (_objs[i].obj_nr == object) {
-				// FIXME - the only thing we need from the OBCD is the image size!
-				// So we could use almost the same code (save for offsets)
+				// FIXME: the only thing we need from the OBCD is the image size!
+				// So we could use almost the same code (except for offsets)
 				// as in the GF_OLD_BUNDLE code. But of course that would break save games
 				// unless we insert special conversion code... <sigh>
 				findObjectInRoom(&foir, foImageHeader, object, room);

Modified: scummvm/trunk/gui/PopUpWidget.cpp
===================================================================
--- scummvm/trunk/gui/PopUpWidget.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/gui/PopUpWidget.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -402,7 +402,6 @@
 }
 
 void PopUpWidget::setSelected(int item) {
-	// FIXME
 	if (item != _selectedItem) {
 		if (item >= 0 && item < (int)_entries.size()) {
 			_selectedItem = item;

Modified: scummvm/trunk/gui/editable.cpp
===================================================================
--- scummvm/trunk/gui/editable.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/gui/editable.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -42,7 +42,7 @@
 void EditableWidget::init() {
 	_caretVisible = false;
 	_caretTime = 0;
-	_caretPos = 0;	// FIXME
+	_caretPos = 0;
 
 	_caretInverse = false;
 

Modified: scummvm/trunk/gui/message.cpp
===================================================================
--- scummvm/trunk/gui/message.cpp	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/gui/message.cpp	2007-09-11 09:20:39 UTC (rev 28890)
@@ -87,8 +87,6 @@
 								lines[i], kTextAlignCenter);
 	}
 
-	// FIXME - allow for more than two buttons, and return in runModal() which one
-	// was selected.
 	if (defaultButton && altButton) {
 		okButtonPos = (_w - (buttonWidth * 2)) / 2;
 		cancelButtonPos = ((_w - (buttonWidth * 2)) / 2) + buttonWidth + 10;

Modified: scummvm/trunk/sound/midiparser.h
===================================================================
--- scummvm/trunk/sound/midiparser.h	2007-09-11 09:19:23 UTC (rev 28889)
+++ scummvm/trunk/sound/midiparser.h	2007-09-11 09:20:39 UTC (rev 28890)
@@ -283,7 +283,7 @@
 	bool   _smartJump;      //!< Support smart expiration of hanging notes when jumping
 	bool   _centerPitchWheelOnUnload;  //!< Center the pitch wheels when unloading a song
 
-	// FIXME: ? Was 32 here, Kyra tracks use 120(!!!) which seems wrong. this is a hacky
+	// FIXME: Was 32 here, Kyra tracks use 120(!!!) which seems wrong. this is a hacky
 	// workaround until situation is investigated.
 	byte * _tracks[120];     //!< Multi-track MIDI formats are supported, up to 120 tracks.
 	byte   _num_tracks;     //!< Count of total tracks for multi-track MIDI formats. 1 for single-track formats.


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