aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2006-05-04 23:24:09 +0000
committerMax Horn2006-05-04 23:24:09 +0000
commit5d5c02d66c680ef442f68138bae6a403e6bc3336 (patch)
treecd52747d0e464e82c963aa588631eed244a65357 /gui
parentc46301bcc285fd216ab76095e81dc54b3ba1d127 (diff)
downloadscummvm-rg350-5d5c02d66c680ef442f68138bae6a403e6bc3336.tar.gz
scummvm-rg350-5d5c02d66c680ef442f68138bae6a403e6bc3336.tar.bz2
scummvm-rg350-5d5c02d66c680ef442f68138bae6a403e6bc3336.zip
Moved GameDetector::setTarget & findGame to the new namespace Base; moved their declaration to base/game.h, their implementation to base/main.cpp (both until we can come up with a better location). Also moved detectMain into main.cpp, where it now is a local static function
svn-id: r22346
Diffstat (limited to 'gui')
-rw-r--r--gui/launcher.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 73f74924a0..26d5e38bfd 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -24,7 +24,7 @@
#include "backends/fs/fs.h"
#include "base/engine.h"
-#include "base/gameDetector.h"
+#include "base/game.h"
#include "base/plugins.h"
#include "base/version.h"
@@ -538,7 +538,7 @@ void LauncherDialog::updateListing() {
if (gameid.empty())
gameid = iter->_key;
if (description.empty()) {
- GameDescriptor g = GameDetector::findGame(gameid);
+ GameDescriptor g = Base::findGame(gameid);
if (!g.description.empty())
description = g.description;
}
@@ -696,7 +696,7 @@ void LauncherDialog::editGame(int item) {
String gameId(ConfMan.get("gameid", _domains[item]));
if (gameId.empty())
gameId = _domains[item];
- EditGameDialog editDialog(_domains[item], GameDetector::findGame(gameId).description);
+ EditGameDialog editDialog(_domains[item], Base::findGame(gameId).description);
if (editDialog.runModal() > 0) {
// User pressed OK, so make changes permanent
@@ -737,7 +737,7 @@ void LauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
case kListItemDoubleClickedCmd:
// Print out what was selected
assert(item >= 0);
- GameDetector::setTarget(_domains[item]);
+ Base::setTarget(_domains[item]);
close();
break;
case kListSelectionChangedCmd: