aboutsummaryrefslogtreecommitdiff
path: root/saga/input.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-01-06 14:02:53 +0000
committerEugene Sandulenko2005-01-06 14:02:53 +0000
commit26d5810b81bfc7153db801d0f8f904eb1b54856f (patch)
tree8818e4d5164529b98accd796026e8bf0d10b8b08 /saga/input.cpp
parent19f604b6ef4170a0acf82c94322dd0940ef0bc18 (diff)
downloadscummvm-rg350-26d5810b81bfc7153db801d0f8f904eb1b54856f.tar.gz
scummvm-rg350-26d5810b81bfc7153db801d0f8f904eb1b54856f.tar.bz2
scummvm-rg350-26d5810b81bfc7153db801d0f8f904eb1b54856f.zip
Next batch of panel-related fixes. Still wrong.
NOTE: lines which start with `;' should contain calls to not yet implemented subsystems like Conversation subsystem svn-id: r16443
Diffstat (limited to 'saga/input.cpp')
-rw-r--r--saga/input.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/saga/input.cpp b/saga/input.cpp
index 1747aa7964..c2c8e39510 100644
--- a/saga/input.cpp
+++ b/saga/input.cpp
@@ -81,10 +81,16 @@ int SagaEngine::processInput() {
break;
case 27: // Esc
// Skip to next scene skip target
- if (!_interface->getMode() == kPanelNull) // FIXME: hack
- _actor->abortAllSpeeches();
- else
- _scene->skipScene();
+ switch (_interface->getMode()) {
+ case kPanelNull:
+ if (_scene->isInDemo())
+ _scene->skipScene();
+ else
+ _actor->abortAllSpeeches();
+ break;
+ default:
+ break;
+ }
break;
default:
break;