diff options
author | Strangerke | 2014-03-21 08:11:07 +0100 |
---|---|---|
committer | Strangerke | 2014-03-21 08:11:07 +0100 |
commit | e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb (patch) | |
tree | c23d121df0f66daa8d54bf07b9a21598f8165fe4 | |
parent | 8a1c472f5b48c9ccb7566fb807f10438f09589c8 (diff) | |
download | scummvm-rg350-e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb.tar.gz scummvm-rg350-e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb.tar.bz2 scummvm-rg350-e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb.zip |
TUCKER: Change the type of the return value of handleSpecialObjectSelectionSequence()
-rw-r--r-- | engines/tucker/sequences.cpp | 6 | ||||
-rw-r--r-- | engines/tucker/tucker.cpp | 2 | ||||
-rw-r--r-- | engines/tucker/tucker.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 137f58dac5..2fb881f77e 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -419,7 +419,7 @@ void TuckerEngine::copyMapRect(int x, int y, int w, int h) { } } -int TuckerEngine::handleSpecialObjectSelectionSequence() { +bool TuckerEngine::handleSpecialObjectSelectionSequence() { char filename[40]; if (_partNum == 1 && _selectedObjectNum == 6) { strcpy(filename, "news1.pcx"); @@ -436,7 +436,7 @@ int TuckerEngine::handleSpecialObjectSelectionSequence() { } else if (_currentInfoString1SourceType == 1 && _currentActionObj1Num == 91) { strcpy(filename, "memo.pcx"); } else { - return 0; + return false; } while (_fadePaletteCounter > 0) { fadeInPalette(); @@ -479,7 +479,7 @@ int TuckerEngine::handleSpecialObjectSelectionSequence() { } } loadLoc(); - return 1; + return true; } AnimationSequencePlayer::AnimationSequencePlayer(OSystem *system, Audio::Mixer *mixer, Common::EventManager *event, CompressedSound *sound, int num) diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index e80a5fcf5b..adf4be6b65 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -3697,7 +3697,7 @@ void TuckerEngine::setActionForInventoryObject() { } _panelLockedFlag = false; } - if (handleSpecialObjectSelectionSequence() == 1) { + if (handleSpecialObjectSelectionSequence()) { return; } _speechSoundNum = _actionObj1Num + _speechSoundBaseNum; diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index b6a17728e4..adcd02b2fe 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -578,7 +578,7 @@ protected: void handleMeanwhileSequence(); void handleMapSequence(); void copyMapRect(int x, int y, int w, int h); - int handleSpecialObjectSelectionSequence(); + bool handleSpecialObjectSelectionSequence(); uint8 *loadFile(const char *filename, uint8 *p); void loadImage(const char *filename, uint8 *dst, int a); |