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

[eriktorbjorn at users.sourceforge.net]

Revision: 42739
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42739&view=rev
Author:   eriktorbjorn
Date:     2009-07-25 06:55:28 +0000 (Sat, 25 Jul 2009)

Log Message:
-----------
Fixed GCC warnings.

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

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2009-07-25 06:36:41 UTC (rev 42738)
+++ scummvm/trunk/engines/scumm/object.cpp	2009-07-25 06:55:28 UTC (rev 42739)
@@ -525,11 +525,12 @@
 				}
 #endif
 				if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
-				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
+				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) {
 					if (_game.version == 0 && _v0ObjectIndex)
 						return i;
 					else
 						return _objs[i].obj_nr;
+				}
 				break;
 			}
 		} while ((_objs[b].state & mask) == a);
@@ -1212,7 +1213,7 @@
 uint32 ScummEngine::getOBCDOffs(int object) const {
 	int i;
 
-	if (_objectOwnerTable[object] != OF_OWNER_ROOM && (_game.version != 0) ||  _v0ObjectInInventory)
+	if ((_objectOwnerTable[object] != OF_OWNER_ROOM && (_game.version != 0))  || _v0ObjectInInventory)
 		return 0;
 
 	// V0 MM Return by Index


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