[Scummvm-cvs-logs] SF.net SVN: scummvm:[45059] scummvm/trunk/engines/sci/engine/kgraphics.cpp

[fingolfin at users.sourceforge.net]

Revision: 45059
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45059&view=rev
Author:   fingolfin
Date:     2009-10-14 09:36:39 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
SCI: Fix warning, cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-14 09:32:49 UTC (rev 45058)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-14 09:36:39 UTC (rev 45059)
@@ -391,17 +391,16 @@
 reg_t kCanBeHere(EngineState *s, int argc, reg_t *argv) {
 	reg_t curObject = argv[0];
 	reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
-
-	if (s->_gui->canBeHere(curObject, listReference))
-		return make_reg(0, 1);
-	return NULL_REG;
+	bool canBeHere = s->_gui->canBeHere(curObject, listReference);
+	return make_reg(0, canBeHere);
 }
 
 // kCantBeHere does the same thing as kCanBeHere, except that it returns the opposite result.
 reg_t kCantBeHere(EngineState *s, int argc, reg_t *argv) {
-	reg_t result = kCanBeHere(s, argc, argv);
-	result.offset = !result.offset;
-	return result;
+	reg_t curObject = argv[0];
+	reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
+	bool canBeHere = s->_gui->canBeHere(curObject, listReference);
+	return make_reg(0, !canBeHere);
 }
 
 reg_t kIsItSkip(EngineState *s, int argc, reg_t *argv) {


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