[Scummvm-cvs-logs] SF.net SVN: scummvm: [29876] scummvm/trunk/engines/sword2/layers.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 29876
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29876&view=rev
Author:   eriktorbjorn
Date:     2007-12-16 01:44:04 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Clear the EXIT_CLICK_ID variable when entering a new room. Otherwise, if an
exit warps back to the same room, clicking on the same exit again is
misinterpreted as a double-click, and that only works if we're already walking
towards that exit. Otherwise, the game will hang. This fixed bug #1851502
("SWORD2: Black-out in Forest").

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/layers.cpp

Modified: scummvm/trunk/engines/sword2/layers.cpp
===================================================================
--- scummvm/trunk/engines/sword2/layers.cpp	2007-12-16 09:36:07 UTC (rev 29875)
+++ scummvm/trunk/engines/sword2/layers.cpp	2007-12-16 09:44:04 UTC (rev 29876)
@@ -63,6 +63,13 @@
 
 	debug(1, "CHANGED TO LOCATION \"%s\"", _vm->_resman->fetchName(res));
 
+	// We have to clear this. Otherwise, if an exit warps back to the same
+	// room (e.g. the jungle maze), clicking on the same exit again will be
+	// misinterpreted as a double-click, and that only works if we're
+	// actually walking towards that exit. Otherwise, the game would hang.
+
+	_vm->_logic->writeVar(EXIT_CLICK_ID, 0);
+
 	// if last screen was using a shading mask (see below)
 	if (_thisScreen.mask_flag) {
 		if (closeLightMask() != RD_OK)


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