thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DETECTOR: Move ADFileProperties(Map) into advancedDetector.h

Browse source
This commit is contained in:
Sven Hesse 2012-06-27 04:07:32 +02:00
parent 7691542496
commit 5ca480aa2e
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/advancedDetector.cpp
View file

@ -22,7 +22,6 @@
#include "common/debug.h" #include "common/debug.h"
#include "common/util.h" #include "common/util.h"
#include "common/hash-str.h"
#include "common/file.h" #include "common/file.h"
#include "common/macresman.h" #include "common/macresman.h"
#include "common/md5.h" #include "common/md5.h"
@ -308,20 +307,6 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
return Common::kNoError; return Common::kNoError;
} }
/**
* A record describing the properties of a file. Used on the existing
* files while detecting a game.
*/
struct ADFileProperties {
int32 size;
Common::String md5;
};
/**
* A map of all relevant existing files in a game directory while detecting.
*/
typedef Common::HashMap<Common::String, ADFileProperties, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ADFilePropertiesMap;
static void reportUnknown(const Common::FSNode &path, const ADFilePropertiesMap &filesProps) { static void reportUnknown(const Common::FSNode &path, const ADFilePropertiesMap &filesProps) {
// TODO: This message should be cleaned up / made more specific. // TODO: This message should be cleaned up / made more specific.
// For example, we should specify at least which engine triggered this. // For example, we should specify at least which engine triggered this.

16
engines/advancedDetector.h
View file

@ -26,6 +26,8 @@
#include "engines/metaengine.h" #include "engines/metaengine.h"
#include "engines/engine.h" #include "engines/engine.h"
#include "common/hash-str.h"
#include "common/gui_options.h" // FIXME: Temporary hack? #include "common/gui_options.h" // FIXME: Temporary hack?
namespace Common { namespace Common {
@ -45,6 +47,20 @@ struct ADGameFileDescription {
int32 fileSize; ///< Size of the described file. Set to -1 to ignore. int32 fileSize; ///< Size of the described file. Set to -1 to ignore.
}; };
/**
* A record describing the properties of a file. Used on the existing
* files while detecting a game.
*/
struct ADFileProperties {
int32 size;
Common::String md5;
};
/**
* A map of all relevant existing files in a game directory while detecting.
*/
typedef Common::HashMap<Common::String, ADFileProperties, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ADFilePropertiesMap;
/** /**
* A shortcut to produce an empty ADGameFileDescription record. Used to mark * A shortcut to produce an empty ADGameFileDescription record. Used to mark
* the end of a list of these. * the end of a list of these.