aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-10-12 08:18:11 +1100
committerPaul Gilbert2011-10-12 08:18:57 +1100
commit271a1018993c30ad7ba74fa5a1d7d6dd78ed7869 (patch)
tree8905f69a4880d760f1822780f0b9aa4645b5518f
parent6508135062e0ed655ae32e91d59d982acde5f537 (diff)
downloadscummvm-rg350-271a1018993c30ad7ba74fa5a1d7d6dd78ed7869.tar.gz
scummvm-rg350-271a1018993c30ad7ba74fa5a1d7d6dd78ed7869.tar.bz2
scummvm-rg350-271a1018993c30ad7ba74fa5a1d7d6dd78ed7869.zip
TSAGE: Further cleanup of the prior NamedHotspot bugfix
-rw-r--r--engines/tsage/core.cpp29
1 files 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);