[Scummvm-cvs-logs] SF.net SVN: scummvm:[35486] scummvm/trunk/engines/saga/interface.cpp

[thebluegr at users.sourceforge.net]

Revision: 35486
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35486&view=rev
Author:   thebluegr
Date:     2008-12-22 14:30:00 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
Added game ID checks for the ITE puzzle in some places that I've missed

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2008-12-22 14:18:06 UTC (rev 35485)
+++ scummvm/trunk/engines/saga/interface.cpp	2008-12-22 14:30:00 UTC (rev 35486)
@@ -654,7 +654,7 @@
 		switch (ascii) {
 		case 'x':
 			setMode(kPanelMain);
-			if (_vm->_puzzle->isActive())
+			if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive())
 				_vm->_puzzle->exitPuzzle();
 			break;
 
@@ -1743,7 +1743,7 @@
 				converseChangePos(1);
 			}
 
-			if (_vm->_puzzle->isActive()) {
+			if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive()) {
 				_vm->_puzzle->handleClick(mousePoint);
 			}
 		}
@@ -2624,7 +2624,7 @@
 
 	_vm->_script->finishDialog(ct->strId, ct->replyId, ct->replyFlags, ct->replyBit);
 
-	if (_vm->_puzzle->isActive())
+	if (_vm->getGameId() == GID_ITE && _vm->_puzzle->isActive())
 		_vm->_puzzle->handleReply(ct->replyId);
 
 	_conversePos = -1;


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