diff options
Diffstat (limited to 'engines/toon')
| -rw-r--r-- | engines/toon/POTFILES | 1 | ||||
| -rw-r--r-- | engines/toon/configure.engine | 2 | ||||
| -rw-r--r-- | engines/toon/detection.cpp | 7 | ||||
| -rw-r--r-- | engines/toon/toon.cpp | 19 |
4 files changed, 17 insertions, 12 deletions
diff --git a/engines/toon/POTFILES b/engines/toon/POTFILES new file mode 100644 index 0000000000..5bdfa37e5f --- /dev/null +++ b/engines/toon/POTFILES @@ -0,0 +1 @@ +engines/toon/toon.cpp diff --git a/engines/toon/configure.engine b/engines/toon/configure.engine index 00c98f7d8a..689bce1c02 100644 --- a/engines/toon/configure.engine +++ b/engines/toon/configure.engine @@ -1,3 +1,3 @@ # This file is included from the main "configure" script # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] -add_engine toon "Toonstruck" yes +add_engine toon "Toonstruck" yes "" "" "highres" diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 4f82514213..5d2e0a9bca 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -127,7 +127,7 @@ static const char * const directoryGlobs[] = { class ToonMetaEngine : public AdvancedMetaEngine { public: ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { - _singleid = "toon"; + _singleId = "toon"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } @@ -173,10 +173,9 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; - pattern += ".???"; + pattern += ".###"; filenames = saveFileMan->listSavefiles(pattern); - sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) SaveStateList saveList; for (Common::StringArray::const_iterator filename = filenames.begin(); filename != filenames.end(); ++filename) { @@ -208,6 +207,8 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const { } } + // Sort saves based on slot number. + Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); return saveList; } diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 9e2905f454..837339402c 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -27,6 +27,7 @@ #include "common/config-manager.h" #include "common/savefile.h" #include "common/memstream.h" +#include "common/translation.h" #include "engines/advancedDetector.h" #include "engines/util.h" @@ -34,7 +35,6 @@ #include "graphics/surface.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" -#include "gui/about.h" #include "gui/message.h" #include "toon/resource.h" #include "toon/toon.h" @@ -708,7 +708,7 @@ bool ToonEngine::showOptions() { entries[2].activeFrame = entries[2].animation->_numFrames - 1; if (!_showConversationText) { - entries[4].activeFrame = 4; + entries[4].activeFrame = 4; } else if (_useAlternativeFont) { entries[4].activeFrame = 8; } else { @@ -797,19 +797,19 @@ bool ToonEngine::showOptions() { // handle sliders if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEMUSICSLIDER) { entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256; - int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; + int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; _audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol); } if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEVOICESLIDER) { entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256; - int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; + int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; _audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, vol); } if (clickingOn == OPTIONMENUHOTSPOT_VOLUMESFXSLIDER) { entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256; - int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; + int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; _audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, vol); } @@ -935,10 +935,12 @@ bool ToonEngine::showOptions() { _gameState->_inMenu = false; _firstFrame = true; _gameState->_currentScrollValue = oldScrollValue; - + restorePalette(); dirtyAllScreen(); + delete optionPicture; + return exitGame; } @@ -1296,6 +1298,7 @@ ToonEngine::ToonEngine(OSystem *syst, const ADGameDescription *gameDescription) _scriptState[i].running = false; } _currentScriptRegion = 0; + _currentFont = nullptr; } ToonEngine::~ToonEngine() { @@ -3334,7 +3337,7 @@ bool ToonEngine::saveGame(int32 slot, const Common::String &saveGameDesc) { Common::String savegameDescription; if (slot == -1) { - GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save", true); + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true); savegameId = dialog->runModalWithCurrentTarget(); savegameDescription = dialog->getResultString(); delete dialog; @@ -3426,7 +3429,7 @@ bool ToonEngine::loadGame(int32 slot) { int16 savegameId; if (slot == -1) { - GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore", false); + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false); savegameId = dialog->runModalWithCurrentTarget(); delete dialog; } else { |