diff options
| author | Nicola Mettifogo | 2008-07-23 07:31:35 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-07-23 07:31:35 +0000 |
| commit | 78ccedf8985151c594ef384fda95de295d39bb5c (patch) | |
| tree | d4a5391ccb93bdd1f483ce46de0a3efa4eb73308 /engines/parallaction/parallaction.cpp | |
| parent | 8932619ee273967821c3c5fc93ae162f75f7d6c8 (diff) | |
| download | scummvm-rg350-78ccedf8985151c594ef384fda95de295d39bb5c.tar.gz scummvm-rg350-78ccedf8985151c594ef384fda95de295d39bb5c.tar.bz2 scummvm-rg350-78ccedf8985151c594ef384fda95de295d39bb5c.zip | |
Removed useless event management code and made readInput() more general.
svn-id: r33225
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 20f6129d78..59a97d1dd4 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -297,6 +297,9 @@ void Parallaction::showLocationComment(const char *text, bool end) { void Parallaction::processInput(InputData *data) { + if (!data) { + return; + } switch (data->_event) { case kEvSaveGame: @@ -326,13 +329,7 @@ void Parallaction::runGame() { runCommentFrame(); if (_input->_inputMode == Input::kInputModeGame) { - if (data->_event != kEvNone) { - processInput(data); - } - - if (_engineFlags & kEngineQuit) - return; - + processInput(data); runPendingZones(); if (_engineFlags & kEngineQuit) |