From 559f2b62ebfa57ce316825aee2da4664e244877d Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 19 Dec 2006 23:57:04 +0000 Subject: Renamed real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION to ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION, and real_ADVANCED_DETECTOR_DETECT_INIT_GAME to ADVANCED_DETECTOR_DETECT_INIT_GAME svn-id: r24896 --- common/advancedDetector.cpp | 4 ++-- common/advancedDetector.h | 4 ++-- engines/agi/detection.cpp | 4 ++-- engines/agos/game.cpp | 4 ++-- engines/cine/detection.cpp | 4 ++-- engines/saga/game.cpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index 9969d46498..9d24fb22d6 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -114,7 +114,7 @@ static DetectedGame toDetectedGame(const ADGameDescription &g, const PlainGameDe return dg; } -DetectedGameList real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( +DetectedGameList ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( const FSList &fslist, const byte *descs, const int descItemSize, @@ -142,7 +142,7 @@ DetectedGameList real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( return detectedGames; } -int real_ADVANCED_DETECTOR_DETECT_INIT_GAME( +int ADVANCED_DETECTOR_DETECT_INIT_GAME( const byte *descs, const int descItemSize, const int md5Bytes, diff --git a/common/advancedDetector.h b/common/advancedDetector.h index 6e186acb87..741a4cf009 100644 --- a/common/advancedDetector.h +++ b/common/advancedDetector.h @@ -101,7 +101,7 @@ GameDescriptor real_ADVANCED_DETECTOR_FIND_GAMEID( // FIXME/TODO: Rename this function to something more sensible. // Possibly move it inside class AdvancedDetector ? -DetectedGameList real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( +DetectedGameList ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( const FSList &fslist, const byte *descs, const int descItemSize, @@ -112,7 +112,7 @@ DetectedGameList real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( // FIXME/TODO: Rename this function to something more sensible. // Possibly move it inside class AdvancedDetector ? -int real_ADVANCED_DETECTOR_DETECT_INIT_GAME( +int ADVANCED_DETECTOR_DETECT_INIT_GAME( const byte *descs, const int descItemSize, const int md5Bytes, diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 9d19bf4d59..26edb3bd46 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -178,7 +178,7 @@ static const AGIGameDescription gameDescriptions[] = { }; bool AgiEngine::initGame() { - int i = Common::real_ADVANCED_DETECTOR_DETECT_INIT_GAME( + int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME( (const byte *)gameDescriptions, sizeof(AGIGameDescription), FILE_MD5_BYTES, @@ -189,7 +189,7 @@ bool AgiEngine::initGame() { } DetectedGameList GAME_detectGames(const FSList &fslist) { - return real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( + return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( fslist, (const byte *)gameDescriptions, sizeof(AGIGameDescription), diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp index e3ddabc227..7b7f0f2168 100644 --- a/engines/agos/game.cpp +++ b/engines/agos/game.cpp @@ -83,7 +83,7 @@ using Common::ADGameDescription; #include "agosgame.cpp" bool AGOSEngine::initGame() { - int i = Common::real_ADVANCED_DETECTOR_DETECT_INIT_GAME( + int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME( (const byte *)gameDescriptions, sizeof(AGOSGameDescription), FILE_MD5_BYTES, @@ -94,7 +94,7 @@ bool AGOSEngine::initGame() { } DetectedGameList GAME_detectGames(const FSList &fslist) { - return real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( + return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( fslist, (const byte *)gameDescriptions, sizeof(AGOSGameDescription), diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index bfcc39fd29..10c9ffbac7 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -574,7 +574,7 @@ static const CINEGameDescription gameDescriptions[] = { }; bool CineEngine::initGame() { - int i = Common::real_ADVANCED_DETECTOR_DETECT_INIT_GAME( + int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME( (const byte *)gameDescriptions, sizeof(CINEGameDescription), FILE_MD5_BYTES, @@ -585,7 +585,7 @@ bool CineEngine::initGame() { } DetectedGameList GAME_detectGames(const FSList &fslist) { - return real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( + return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( fslist, (const byte *)gameDescriptions, sizeof(CINEGameDescription), diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp index 2fce0bd59b..5a9b0dcbbf 100644 --- a/engines/saga/game.cpp +++ b/engines/saga/game.cpp @@ -61,7 +61,7 @@ using Common::ADGameDescription; #include "sagagame.cpp" bool SagaEngine::initGame() { - int i = Common::real_ADVANCED_DETECTOR_DETECT_INIT_GAME( + int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME( (const byte *)gameDescriptions, sizeof(SAGAGameDescription), FILE_MD5_BYTES, @@ -77,7 +77,7 @@ bool SagaEngine::initGame() { } DetectedGameList GAME_detectGames(const FSList &fslist) { - return real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( + return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION( fslist, (const byte *)gameDescriptions, sizeof(SAGAGameDescription), -- cgit v1.2.3