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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Oct 19 02:07:05 CEST 2006


Revision: 24383
          http://svn.sourceforge.net/scummvm/?rev=24383&view=rev
Author:   fingolfin
Date:     2006-10-18 17:06:59 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/object.cpp
    scummvm/trunk/engines/scumm/script_v2.cpp
    scummvm/trunk/engines/scumm/verbs.cpp

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2006-10-18 23:09:36 UTC (rev 24382)
+++ scummvm/trunk/engines/scumm/object.cpp	2006-10-19 00:06:59 UTC (rev 24383)
@@ -161,9 +161,8 @@
 
 	if (getOwner(obj) == OF_OWNER_ROOM) {
 		for (i = 0; i < _numLocalObjects; i++)  {
-			if (_objs[i].obj_nr == obj) {
-				if (!_objs[i].fl_object_index)
-					return;
+			if (_objs[i].obj_nr == obj && _objs[i].fl_object_index) {
+				// Removing an flObject from a room means we can nuke it
 				_res->nukeResource(rtFlObject, _objs[i].fl_object_index);
 				_objs[i].obj_nr = 0;
 				_objs[i].fl_object_index = 0;

Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-18 23:09:36 UTC (rev 24382)
+++ scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-19 00:06:59 UTC (rev 24383)
@@ -1345,7 +1345,7 @@
 	if (c == 0) {
 		if (_game.id == GID_MANIAC && _game.version == 1 && !(_game.platform == Common::kPlatformNES)) {
 			// Convert older light mode values into
-			// equivalent values.of later games
+			// equivalent values of later games.
 			// 0 Darkness
 			// 1 Flashlight
 			// 2 Lighted area

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2006-10-18 23:09:36 UTC (rev 24382)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2006-10-19 00:06:59 UTC (rev 24383)
@@ -814,7 +814,6 @@
 	int imgw, imgh;
 	int i, tmp;
 	byte *obim;
-	const ImageHeader *imhd;
 	uint32 size;
 
 	if ((vs = findVirtScreen(y)) == NULL)
@@ -841,7 +840,7 @@
 		imgh = (*(obim + size + 17)) / 8;
 		imptr = getObjectImage(obim, 1);
 	} else {
-		imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
+		const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
 		if (_game.version >= 7) {
 			imgw = READ_LE_UINT16(&imhd->v7.width) / 8;
 			imgh = READ_LE_UINT16(&imhd->v7.height) / 8;


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