diff options
| -rw-r--r-- | base/game.cpp | 80 | ||||
| -rw-r--r-- | base/main.cpp | 26 | ||||
| -rw-r--r-- | base/module.mk | 1 | ||||
| -rw-r--r-- | base/plugins.cpp | 33 |
4 files changed, 81 insertions, 59 deletions
diff --git a/base/game.cpp b/base/game.cpp new file mode 100644 index 0000000000..b5a381f10f --- /dev/null +++ b/base/game.cpp @@ -0,0 +1,80 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001-2006 The ScummVM project + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#include "base/game.h" +#include "base/plugins.h" + +void GameDescriptor::updateDesc(const char *extra) { + // TODO: The format used here (LANG/PLATFORM/EXTRA) is not set in stone. + // We may want to change the order (PLATFORM/EXTRA/LANG, anybody?), or + // the seperator (instead of '/' use ', ' or ' '). + const bool hasCustomLanguage = (this->contains("language") && (this->language() != Common::UNK_LANG)); + const bool hasCustomPlatform = (this->contains("platform") && (this->platform() != Common::kPlatformUnknown)); + const bool hasExtraDesc = (extra && extra[0]); + + // Adapt the description string if custom platform/language is set. + if (hasCustomLanguage || hasCustomPlatform || hasExtraDesc) { + Common::String descr = this->description(); + + descr += " ("; + if (hasCustomLanguage) + descr += Common::getLanguageDescription(this->language()); + if (hasCustomPlatform) { + if (hasCustomLanguage) + descr += "/"; + descr += Common::getPlatformDescription(this->platform()); + } + if (hasExtraDesc) { + if (hasCustomPlatform || hasCustomLanguage) + descr += "/"; + descr += extra; + } + descr += ")"; + this->operator []("description") = descr; + } +} + +namespace Base { + +// TODO: Find a better place for this function. +GameDescriptor findGame(const Common::String &gameName, const Plugin **plugin) { + // Find the GameDescriptor for this target + const PluginList &plugins = PluginManager::instance().getPlugins(); + GameDescriptor result; + + if (plugin) + *plugin = 0; + + PluginList::const_iterator iter = plugins.begin(); + for (iter = plugins.begin(); iter != plugins.end(); ++iter) { + result = (*iter)->findGame(gameName.c_str()); + if (!result.gameid().empty()) { + if (plugin) + *plugin = *iter; + break; + } + } + return result; +} + +} // End of namespace Base diff --git a/base/main.cpp b/base/main.cpp index 156998ab50..04a621aaf3 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -55,32 +55,6 @@ #endif -namespace Base { - -// TODO: Find a better place for this function. -GameDescriptor findGame(const Common::String &gameName, const Plugin **plugin) { - // Find the GameDescriptor for this target - const PluginList &plugins = PluginManager::instance().getPlugins(); - GameDescriptor result; - - if (plugin) - *plugin = 0; - - PluginList::const_iterator iter = plugins.begin(); - for (iter = plugins.begin(); iter != plugins.end(); ++iter) { - result = (*iter)->findGame(gameName.c_str()); - if (!result.gameid().empty()) { - if (plugin) - *plugin = *iter; - break; - } - } - return result; -} - -} // End of namespace Base - - static bool launcherDialog(OSystem &system) { system.beginGFXTransaction(); diff --git a/base/module.mk b/base/module.mk index 860342eedf..9a9312fa73 100644 --- a/base/module.mk +++ b/base/module.mk @@ -3,6 +3,7 @@ MODULE := base MODULE_OBJS := \ main.o \ commandLine.o \ + game.o \ plugins.o \ version.o diff --git a/base/plugins.cpp b/base/plugins.cpp index 90cbb5de78..7734e2c5f3 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -25,39 +25,6 @@ #include "common/util.h" -void GameDescriptor::updateDesc(const char *extra) { - // TODO: The format used here (LANG/PLATFORM/EXTRA) is not set in stone. - // We may want to change the order (PLATFORM/EXTRA/LANG, anybody?), or - // the seperator (instead of '/' use ', ' or ' '). - const bool hasCustomLanguage = (this->contains("language") && (this->language() != Common::UNK_LANG)); - const bool hasCustomPlatform = (this->contains("platform") && (this->platform() != Common::kPlatformUnknown)); - const bool hasExtraDesc = (extra && extra[0]); - - // Adapt the description string if custom platform/language is set. - if (hasCustomLanguage || hasCustomPlatform || hasExtraDesc) { - Common::String descr = this->description(); - - descr += " ("; - if (hasCustomLanguage) - descr += Common::getLanguageDescription(this->language()); - if (hasCustomPlatform) { - if (hasCustomLanguage) - descr += "/"; - descr += Common::getPlatformDescription(this->platform()); - } - if (hasExtraDesc) { - if (hasCustomPlatform || hasCustomLanguage) - descr += "/"; - descr += extra; - } - descr += ")"; - this->operator []("description") = descr; - } -} - - -#pragma mark - - #ifndef DYNAMIC_MODULES class StaticPlugin : public Plugin { PluginRegistrator *_plugin; |