[Scummvm-cvs-logs] SF.net SVN: scummvm: [24896] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 24896
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24896&view=rev
Author:   fingolfin
Date:     2006-12-19 15:57:04 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
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

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/common/advancedDetector.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agos/game.cpp
    scummvm/trunk/engines/cine/detection.cpp
    scummvm/trunk/engines/saga/game.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/common/advancedDetector.cpp	2006-12-19 23:57:04 UTC (rev 24896)
@@ -114,7 +114,7 @@
 	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 @@
 	return detectedGames;
 }
 
-int real_ADVANCED_DETECTOR_DETECT_INIT_GAME(
+int ADVANCED_DETECTOR_DETECT_INIT_GAME(
 	const byte *descs,
 	const int descItemSize,
 	const int md5Bytes,

Modified: scummvm/trunk/common/advancedDetector.h
===================================================================
--- scummvm/trunk/common/advancedDetector.h	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/common/advancedDetector.h	2006-12-19 23:57:04 UTC (rev 24896)
@@ -101,7 +101,7 @@
 
 // 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 @@
 
 // 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,

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/engines/agi/detection.cpp	2006-12-19 23:57:04 UTC (rev 24896)
@@ -178,7 +178,7 @@
 };
 
 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 @@
 }
 
 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),

Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/engines/agos/game.cpp	2006-12-19 23:57:04 UTC (rev 24896)
@@ -83,7 +83,7 @@
 #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 @@
 }
 
 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),

Modified: scummvm/trunk/engines/cine/detection.cpp
===================================================================
--- scummvm/trunk/engines/cine/detection.cpp	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/engines/cine/detection.cpp	2006-12-19 23:57:04 UTC (rev 24896)
@@ -574,7 +574,7 @@
 };
 
 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 @@
 }
 
 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),

Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2006-12-19 23:37:03 UTC (rev 24895)
+++ scummvm/trunk/engines/saga/game.cpp	2006-12-19 23:57:04 UTC (rev 24896)
@@ -61,7 +61,7 @@
 #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 @@
 }
 
 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),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.