aboutsummaryrefslogtreecommitdiff
path: root/engines/game.h
diff options
context:
space:
mode:
authorMax Horn2011-06-13 01:25:53 +0200
committerMax Horn2011-06-14 18:17:02 +0200
commit6412d091268d299f7f4d31382b0e4e9e4e352ad9 (patch)
treeaaaf1ce6901c07ffb56525e49288eb36ddef3024 /engines/game.h
parent01c4d900168c5521fa9b8342f919eb12570fac0f (diff)
downloadscummvm-rg350-6412d091268d299f7f4d31382b0e4e9e4e352ad9.tar.gz
scummvm-rg350-6412d091268d299f7f4d31382b0e4e9e4e352ad9.tar.bz2
scummvm-rg350-6412d091268d299f7f4d31382b0e4e9e4e352ad9.zip
DETECTOR: Remove PlainGameDescriptorGUIOpts
Diffstat (limited to 'engines/game.h')
-rw-r--r--engines/game.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/engines/game.h b/engines/game.h
index 0d0fc853a3..3216cfb628 100644
--- a/engines/game.h
+++ b/engines/game.h
@@ -40,17 +40,6 @@ struct PlainGameDescriptor {
};
/**
- * Same as PlainGameDsscriptor except it adds Game GUI options parameter
- * This is a plain struct to make it possible to declare NULL-terminated C arrays
- * consisting of PlainGameDescriptors.
- */
-struct PlainGameDescriptorGUIOpts {
- const char *gameid;
- const char *description;
- uint32 guioptions;
-};
-
-/**
* Given a list of PlainGameDescriptors, returns the first PlainGameDescriptor
* matching the given gameid. If not match is found return 0.
* The end of the list must be marked by an entry with gameid 0.
@@ -67,8 +56,7 @@ const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const Pla
class GameDescriptor : public Common::StringMap {
public:
GameDescriptor();
- GameDescriptor(const PlainGameDescriptor &pgd);
- GameDescriptor(const PlainGameDescriptorGUIOpts &pgd);
+ GameDescriptor(const PlainGameDescriptor &pgd, uint32 guioptions = 0);
GameDescriptor(const Common::String &gameid,
const Common::String &description,
Common::Language language = Common::UNK_LANG,
@@ -102,7 +90,7 @@ public:
GameList(const GameList &list) : Common::Array<GameDescriptor>(list) {}
GameList(const PlainGameDescriptor *g) {
while (g->gameid) {
- push_back(GameDescriptor(g->gameid, g->description));
+ push_back(GameDescriptor(*g));
g++;
}
}