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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Wed Sep 8 22:11:11 CEST 2010


Revision: 52642
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52642&view=rev
Author:   m_kiewitz
Date:     2010-09-08 20:11:11 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
SCI: ability to change r_acc within DrawControl

preparation for returning rect array on |r| textcodes

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-09-08 18:04:38 UTC (rev 52641)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-09-08 20:11:11 UTC (rev 52642)
@@ -903,6 +903,10 @@
 	reg_t controlObject = argv[0];
 	Common::String objName = s->_segMan->getObjectName(controlObject);
 
+	// Most of the time, we won't return anything to the caller
+	//  but |r| textcodes will trigger creation of rects in memory and will then set s->r_acc
+	s->r_acc = NULL_REG;
+
 	// Disable the "Change Directory" button, as we don't allow the game engine to
 	// change the directory where saved games are placed
 	// "changeDirItem" is used in the import windows of QFG2&3
@@ -941,7 +945,7 @@
 	}
 
 	_k_GenericDrawControl(s, controlObject, false);
-	return NULL_REG;
+	return s->r_acc;
 }
 
 reg_t kHiliteControl(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.




More information about the Scummvm-git-logs mailing list