diff options
| author | Paul Gilbert | 2011-10-12 07:58:08 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-12 07:58:08 +1100 |
| commit | fa27d6fe69e9cc2901e1de9ac9fffc59107363dc (patch) | |
| tree | 7a06c288e4a2c84b0687cce7661dc838a91d2c8c /engines/tsage | |
| parent | a52f090b7b9a5db749986ab4c66d59638ac3fbbd (diff) | |
| download | scummvm-rg350-fa27d6fe69e9cc2901e1de9ac9fffc59107363dc.tar.gz scummvm-rg350-fa27d6fe69e9cc2901e1de9ac9fffc59107363dc.tar.bz2 scummvm-rg350-fa27d6fe69e9cc2901e1de9ac9fffc59107363dc.zip | |
TSAGE: Bugfix for overriden named hotspots no longer working in Ringworld
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/core.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index c237548547..bc20f221c2 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: |