diff options
Diffstat (limited to 'engines/avalanche')
| -rw-r--r-- | engines/avalanche/POTFILES | 1 | ||||
| -rw-r--r-- | engines/avalanche/animation.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/clock.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/configure.engine | 2 | ||||
| -rw-r--r-- | engines/avalanche/detection.cpp | 10 | ||||
| -rw-r--r-- | engines/avalanche/dialogs.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/ghostroom.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/graphics.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/highscore.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/mainmenu.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/nim.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/parser.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/shootemup.cpp | 1 | ||||
| -rw-r--r-- | engines/avalanche/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/sound.h | 5 |
16 files changed, 31 insertions, 10 deletions
diff --git a/engines/avalanche/POTFILES b/engines/avalanche/POTFILES new file mode 100644 index 0000000000..5b0bb910ed --- /dev/null +++ b/engines/avalanche/POTFILES @@ -0,0 +1 @@ +engines/avalanche/parser.cpp diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index 451b4a1c68..6946e448d8 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -27,6 +27,7 @@ /* TRIP5 Trippancy V - the sprite animation subsystem */ +#include "common/system.h" #include "avalanche/avalanche.h" #include "avalanche/animation.h" diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 6cfe4dfdb6..8726ef784a 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -29,6 +29,7 @@ #include "common/random.h" #include "common/savefile.h" +#include "common/system.h" #include "graphics/thumbnail.h" namespace Avalanche { diff --git a/engines/avalanche/clock.cpp b/engines/avalanche/clock.cpp index 6d398d9921..4276e41d99 100644 --- a/engines/avalanche/clock.cpp +++ b/engines/avalanche/clock.cpp @@ -28,6 +28,8 @@ #include "avalanche/clock.h" #include "avalanche/avalanche.h" +#include "common/system.h" + namespace Avalanche { Clock::Clock(AvalancheEngine *vm) { diff --git a/engines/avalanche/configure.engine b/engines/avalanche/configure.engine index 28d6a558db..9b913ff053 100644 --- a/engines/avalanche/configure.engine +++ b/engines/avalanche/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 avalanche "Lord Avalot d'Argent" no +add_engine avalanche "Lord Avalot d'Argent" no "" "" "highres" diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp index 028f167e70..def395b77f 100644 --- a/engines/avalanche/detection.cpp +++ b/engines/avalanche/detection.cpp @@ -40,7 +40,7 @@ uint32 AvalancheEngine::getFeatures() const { } const char *AvalancheEngine::getGameId() const { - return _gameDescription->desc.gameid; + return _gameDescription->desc.gameId; } static const PlainGameDescriptor avalancheGames[] = { @@ -99,7 +99,8 @@ bool AvalancheMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSupportsLoadingDuringStartup) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { @@ -107,10 +108,9 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { Common::StringArray filenames; Common::String pattern = target; pattern.toUppercase(); - 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) { @@ -152,6 +152,8 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { } } + // Sort saves based on slot number. + Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); return saveList; } diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp index f95440900b..d1a7234b03 100644 --- a/engines/avalanche/dialogs.cpp +++ b/engines/avalanche/dialogs.cpp @@ -30,6 +30,7 @@ #include "avalanche/avalanche.h" #include "avalanche/dialogs.h" +#include "common/system.h" #include "common/random.h" namespace Avalanche { diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp index 047a3670c2..254bf5e174 100644 --- a/engines/avalanche/ghostroom.cpp +++ b/engines/avalanche/ghostroom.cpp @@ -29,6 +29,7 @@ #include "avalanche/ghostroom.h" #include "common/random.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 60c23594d3..03c9e9e3cb 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -28,6 +28,7 @@ #include "avalanche/avalanche.h" #include "avalanche/graphics.h" +#include "common/system.h" #include "engines/util.h" #include "graphics/palette.h" diff --git a/engines/avalanche/highscore.cpp b/engines/avalanche/highscore.cpp index 5f47aeb894..b977e2f33c 100644 --- a/engines/avalanche/highscore.cpp +++ b/engines/avalanche/highscore.cpp @@ -29,6 +29,7 @@ #include "avalanche/highscore.h" #include "common/savefile.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/mainmenu.cpp b/engines/avalanche/mainmenu.cpp index 543684556c..ff24b37e0d 100644 --- a/engines/avalanche/mainmenu.cpp +++ b/engines/avalanche/mainmenu.cpp @@ -28,6 +28,8 @@ #include "avalanche/avalanche.h" #include "avalanche/mainmenu.h" +#include "common/system.h" + namespace Avalanche { MainMenu::MainMenu(AvalancheEngine *vm) { diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp index 79be16d3c3..a0a1756e0a 100644 --- a/engines/avalanche/nim.cpp +++ b/engines/avalanche/nim.cpp @@ -28,6 +28,8 @@ #include "avalanche/avalanche.h" #include "avalanche/nim.h" +#include "common/system.h" + namespace Avalanche { const char * const Nim::kNames[2] = {"Avalot", "Dogfood"}; @@ -524,7 +526,7 @@ void Nim::dogFood() { // 1) Look for 2 equal lines, then take the odd one out. // 2) Look for A.P.s, and capitalise on them. // 3) Go any old where. - const byte other[3][2] = { { 2, 3 }, { 1, 3 }, { 1, 2 } }; + const byte other[3][2] = { { 1, 2 }, { 0, 2 }, { 0, 1 } }; for (int i = 0; i < 3; i++) { // Look for 2 equal lines. if (_stones[other[i][0]] == _stones[other[i][1]]) { diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp index 220186ca5e..112dce93ac 100644 --- a/engines/avalanche/parser.cpp +++ b/engines/avalanche/parser.cpp @@ -30,6 +30,8 @@ #include "avalanche/nim.h" #include "gui/saveload.h" +#include "common/system.h" +#include "common/translation.h" namespace Avalanche { @@ -1883,7 +1885,7 @@ void Parser::doThat() { break; case kVerbCodeLoad: { - GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore", false); + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false); int16 savegameId = dialog->runModalWithCurrentTarget(); delete dialog; @@ -1895,7 +1897,7 @@ void Parser::doThat() { } break; case kVerbCodeSave: { - GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save", true); + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true); int16 savegameId = dialog->runModalWithCurrentTarget(); Common::String savegameDescription = dialog->getResultString(); delete dialog; diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp index e5e44ed934..7f6cf99974 100644 --- a/engines/avalanche/shootemup.cpp +++ b/engines/avalanche/shootemup.cpp @@ -29,6 +29,7 @@ #include "avalanche/shootemup.h" #include "common/random.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/sound.cpp b/engines/avalanche/sound.cpp index 0223bead48..a441121e90 100644 --- a/engines/avalanche/sound.cpp +++ b/engines/avalanche/sound.cpp @@ -23,7 +23,7 @@ #include "avalanche/avalanche.h" #include "avalanche/sound.h" -#include "audio/audiostream.h" +#include "audio/softsynth/pcspk.h" #include "common/config-manager.h" namespace Avalanche { diff --git a/engines/avalanche/sound.h b/engines/avalanche/sound.h index a67016a206..f9775654b4 100644 --- a/engines/avalanche/sound.h +++ b/engines/avalanche/sound.h @@ -24,7 +24,10 @@ #define AVALANCHE_SOUND_H #include "audio/mixer.h" -#include "audio/softsynth/pcspk.h" + +namespace Audio { +class PCSpeaker; +} namespace Avalanche { |
