[Scummvm-cvs-logs] scummvm master -> 975801b6702daefe85f2cc91525ba474bd4aa3aa

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
975801b670 TSAGE: Disable right click in R2R Scene 1330


Commit: 975801b6702daefe85f2cc91525ba474bd4aa3aa
    https://github.com/scummvm/scummvm/commit/975801b6702daefe85f2cc91525ba474bd4aa3aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-02-17T20:26:05-08:00

Commit Message:
TSAGE: Disable right click in R2R Scene 1330

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index d88d012..c2ce426 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -4107,7 +4107,8 @@ void SceneHandler::process(Event &event) {
 
 	// Check for displaying right-click dialog
 	if ((event.eventType == EVENT_BUTTON_DOWN) && (event.btnState == BTNSHIFT_RIGHT) &&
-			g_globals->_player._uiEnabled) {
+			g_globals->_player._uiEnabled &&
+			((g_vm->getGameID() != GType_Ringworld2) || (R2_GLOBALS._sceneManager._sceneNumber != 1330))) {
 		g_globals->_game->rightClick();
 
 		event.handled = true;