[Scummvm-cvs-logs] scummvm master -> fa27d6fe69e9cc2901e1de9ac9fffc59107363dc

[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:
fa27d6fe69 TSAGE: Bugfix for overriden named hotspots no longer working in Ringworld


Commit: fa27d6fe69e9cc2901e1de9ac9fffc59107363dc
    https://github.com/scummvm/scummvm/commit/fa27d6fe69e9cc2901e1de9ac9fffc59107363dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-11T13:58:08-07:00

Commit Message:
TSAGE: Bugfix for overriden named hotspots no longer working in Ringworld

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c237548..bc20f22 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1742,27 +1742,21 @@ bool NamedHotspot::startAction(CursorType action, Event &event) {
 		// Nothing
 		return false;
 	case CURSOR_LOOK:
-		if (_lookLineNum == -1)
-			SceneHotspot::doAction(action);
-		else if (g_vm->getGameID() == GType_BlueForce)
+		if ((g_vm->getGameID() == GType_Ringworld) || (_lookLineNum == -1))
+			doAction(action);
+		else 
 			SceneItem::display2(_resNum, _lookLineNum);
-		else
-			SceneItem::display(_resNum, _lookLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
 		return true;
 	case CURSOR_USE:
-		if (_useLineNum == -1)
-			SceneHotspot::doAction(action);
-		else if (g_vm->getGameID() == GType_BlueForce)
+		if ((g_vm->getGameID() == GType_Ringworld) || (_useLineNum == -1))
+			doAction(action);
+		else 
 			SceneItem::display2(_resNum, _useLineNum);
-		else
-			SceneItem::display(_resNum, _useLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
 		return true;
 	case CURSOR_TALK:
-		if (_talkLineNum == -1)
-			SceneHotspot::doAction(action);
-		else if (g_vm->getGameID() == GType_BlueForce)
-			SceneItem::display2(_resNum, _talkLineNum);
-		else
+		if ((g_vm->getGameID() == GType_Ringworld) || (_talkLineNum == -1))
+			doAction(action);
+		else 
 			SceneItem::display2(_resNum, _talkLineNum);
 		return true;
 	default: