aboutsummaryrefslogtreecommitdiff
path: root/base/gameDetector.h
diff options
context:
space:
mode:
authorMax Horn2006-02-18 12:50:48 +0000
committerMax Horn2006-02-18 12:50:48 +0000
commit01fc7034b535e2dcc0526d5ac4d1ae4eae60459f (patch)
tree4e10d3d934d77825bd9f76fc4eca0177067e596a /base/gameDetector.h
parent8ac17430ac7aa3bba5630d74a1eeda54bce7801b (diff)
downloadscummvm-rg350-01fc7034b535e2dcc0526d5ac4d1ae4eae60459f.tar.gz
scummvm-rg350-01fc7034b535e2dcc0526d5ac4d1ae4eae60459f.tar.bz2
scummvm-rg350-01fc7034b535e2dcc0526d5ac4d1ae4eae60459f.zip
- Merged GameDetector::detectGame() into GameDetector::detectMain()
- Replaced GameSettings GameDetector::_game by a simple gameid string svn-id: r20753
Diffstat (limited to 'base/gameDetector.h')
-rw-r--r--base/gameDetector.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/gameDetector.h b/base/gameDetector.h
index bdbb68bf90..0cada3e597 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -65,14 +65,13 @@ public:
bool detectMain();
String _targetName;
- GameSettings _game; // TODO: Eventually get rid of this?!
- const Plugin *_plugin;
+ String _gameid;
bool _dumpScripts;
bool _force1xOverlay;
- void setTarget(const String &name);
+ const Plugin *_plugin; // TODO: This should be protected
public:
Engine *createEngine(OSystem *system);
@@ -81,8 +80,8 @@ public:
static GameSettings findGame(const String &gameName, const Plugin **plugin = NULL);
-protected:
- bool detectGame(void);
+//protected:
+ void setTarget(const String &name); // TODO: This should be protected
};
#endif