[Scummvm-cvs-logs] CVS: scummvm/saga script.cpp,1.68,1.69

[Torbjörn Andersson]

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

Modified Files:
	script.cpp 
Log Message:
When setting a new verb, clear the "pointer object", i.e. the variable that
keeps track of whatever object the pointer is hovering over. This way, the
pointer object will be updated but with the new verb applied to it. I was
getting tired of having to move the cursor off and on the object whenever I
changed verb.

This isn't exactly how the original engine did it, but it appears to work.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- script.cpp	8 Jun 2005 13:49:56 -0000	1.68
+++ script.cpp	10 Jun 2005 13:56:51 -0000	1.69
@@ -69,8 +69,7 @@
 	_stickyVerb = kVerbWalkTo;
 	_leftButtonVerb = kVerbNone;
 	_rightButtonVerb = kVerbNone;
-	_pointerObject = 0;
-
+	_pointerObject = ID_NOTHING;
 	
 	_staticSize = 0;
 	_commonBufferSize = COMMON_BUFFER_SIZE;
@@ -419,6 +418,11 @@
 	_firstObjectSet = false;
 	_secondObjectNeeded = false;
 
+	// The pointer object will be updated again immediately. This way the
+	// new verb will be applied to it. It's not exactly how the original
+	// engine did it, but it appears to work.
+	_pointerObject = ID_NOTHING;
+
 	setLeftButtonVerb( verb );
 	showVerb();
 }