From 271a1018993c30ad7ba74fa5a1d7d6dd78ed7869 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 12 Oct 2011 08:18:11 +1100 Subject: TSAGE: Further cleanup of the prior NamedHotspot bugfix --- engines/tsage/core.cpp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index bc20f221c2..3441c81222 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -1742,22 +1742,31 @@ bool NamedHotspot::startAction(CursorType action, Event &event) { // Nothing return false; case CURSOR_LOOK: - if ((g_vm->getGameID() == GType_Ringworld) || (_lookLineNum == -1)) - doAction(action); - else + if (g_vm->getGameID() == GType_Ringworld) { + if (_lookLineNum == -1) + doAction(action); + else + SceneItem::display(_resNum, _lookLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END); + } else SceneItem::display2(_resNum, _lookLineNum); return true; case CURSOR_USE: - if ((g_vm->getGameID() == GType_Ringworld) || (_useLineNum == -1)) - doAction(action); - else + if (g_vm->getGameID() == GType_Ringworld) { + if (_useLineNum == -1) + doAction(action); + else + SceneItem::display(_resNum, _useLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END); + } else SceneItem::display2(_resNum, _useLineNum); return true; case CURSOR_TALK: - if ((g_vm->getGameID() == GType_Ringworld) || (_talkLineNum == -1)) - doAction(action); - else - SceneItem::display2(_resNum, _talkLineNum); + if (g_vm->getGameID() == GType_Ringworld) { + if (_talkLineNum == -1) + doAction(action); + else + SceneItem::display2(_resNum, _talkLineNum); + } else + SceneItem::display(_resNum, _lookLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END); return true; default: return SceneHotspot::startAction(action, event); -- cgit v1.2.3