aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorMax Horn2007-02-13 23:37:44 +0000
committerMax Horn2007-02-13 23:37:44 +0000
commit7572d2b4f2ac98cf31602d6c5e4ed7399de54a30 (patch)
treed96c82e9cae2736feef9b6d5ac7801273c5107a7 /engines/agi
parentde02e840a6dd619e221a750b0b2a63d157f05114 (diff)
downloadscummvm-rg350-7572d2b4f2ac98cf31602d6c5e4ed7399de54a30.tar.gz
scummvm-rg350-7572d2b4f2ac98cf31602d6c5e4ed7399de54a30.tar.bz2
scummvm-rg350-7572d2b4f2ac98cf31602d6c5e4ed7399de54a30.zip
Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/detection.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 96e74d2da7..920ef287ce 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -1741,6 +1741,8 @@ static const Common::ADParams detectionParams = {
"agi",
// List of files for file-based fallback detection (optional)
0,
+ // Fallback callback
+ 0,
// Flags
Common::kADFlagAugmentPreferredTarget
};
@@ -1752,12 +1754,8 @@ REGISTER_PLUGIN(AGI, "AGI v2 + v3 Engine", "Sierra AGI Engine (C) Sierra On-Line
namespace Agi {
bool AgiEngine::initGame() {
- int i = Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
- if (i < 0)
- return false;
-
- _gameDescription = &gameDescriptions[i];
- return true;
+ _gameDescription = (const AGIGameDescription *)Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
+ return (_gameDescription != 0);
}
} // End of namespace Agi