[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.147,1.148

Eugene Sandulenko sev at users.sourceforge.net
Sat Oct 8 18:22:07 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9172

Modified Files:
	interface.cpp 
Log Message:
Simplified handleChapterSelectionUpdate()


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- interface.cpp	9 Oct 2005 01:18:26 -0000	1.147
+++ interface.cpp	9 Oct 2005 01:20:46 -0000	1.148
@@ -1215,23 +1215,11 @@
 }
 
 void Interface::handleChapterSelectionUpdate(const Point& mousePoint) {
-	uint16 objectId =ID_NOTHING;
-	int16 objectFlags;
-	uint16 newObjectId;
+	uint16 objectId;
 
 	// FIXME: Original handled more object types here.
 
-	newObjectId = _vm->_actor->hitTest(mousePoint, true);
-
-	if (newObjectId != ID_NOTHING) {
-		if (objectTypeId(newObjectId) == kGameObjectObject) {
-			objectId = newObjectId;
-			objectFlags = 0;
-		} else {
-			objectId = newObjectId;
-			objectFlags = kObjUseWith;
-		}
-	}
+	objectId = _vm->_actor->hitTest(mousePoint, true);
 
 	if (objectId != _vm->_script->_pointerObject) {
 		_vm->_script->_pointerObject = objectId;





More information about the Scummvm-git-logs mailing list