[Scummvm-cvs-logs] SF.net SVN: scummvm: [25137] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 25137
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25137&view=rev
Author:   fingolfin
Date:     2007-01-20 16:25:04 -0800 (Sat, 20 Jan 2007)

Log Message:
-----------
Added game.cpp file with some funcs/methods declared in game.h

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
    scummvm/trunk/base/module.mk
    scummvm/trunk/base/plugins.cpp

Added Paths:
-----------
    scummvm/trunk/base/game.cpp

Added: scummvm/trunk/base/game.cpp
===================================================================
--- scummvm/trunk/base/game.cpp	                        (rev 0)
+++ scummvm/trunk/base/game.cpp	2007-01-21 00:25:04 UTC (rev 25137)
@@ -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


Property changes on: scummvm/trunk/base/game.cpp
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Rev Author URL Id
Name: svn:eol-style
   + native

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2007-01-21 00:11:45 UTC (rev 25136)
+++ scummvm/trunk/base/main.cpp	2007-01-21 00:25:04 UTC (rev 25137)
@@ -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();

Modified: scummvm/trunk/base/module.mk
===================================================================
--- scummvm/trunk/base/module.mk	2007-01-21 00:11:45 UTC (rev 25136)
+++ scummvm/trunk/base/module.mk	2007-01-21 00:25:04 UTC (rev 25137)
@@ -3,6 +3,7 @@
 MODULE_OBJS := \
 	main.o \
 	commandLine.o \
+	game.o \
 	plugins.o \
 	version.o
 

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2007-01-21 00:11:45 UTC (rev 25136)
+++ scummvm/trunk/base/plugins.cpp	2007-01-21 00:25:04 UTC (rev 25137)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.