[Scummvm-cvs-logs] SF.net SVN: scummvm: [21733] scummvm/trunk/engines/cine

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Apr 9 12:45:03 CEST 2006


Revision: 21733
Author:   fingolfin
Date:     2006-04-09 12:44:40 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21733&view=rev

Log Message:
-----------
Moved GameSettings to namespace Cine; moved savePath to various.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/cine/cine.cpp
    scummvm/trunk/engines/cine/cine.h
    scummvm/trunk/engines/cine/various.cpp
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp	2006-04-09 17:53:47 UTC (rev 21732)
+++ scummvm/trunk/engines/cine/cine.cpp	2006-04-09 19:44:40 UTC (rev 21733)
@@ -51,21 +51,12 @@
 
 static void initialize();
 
-char *savePath;
-
-} // End of namespace Cine
-
-
-
 struct GameSettings {
-	const char *name;
+	const char *gameid;
 	const char *description;
 	byte id;
 	uint32 features;
 	const char *detectname;
-	GameDescriptor toGameDescriptor() const {
-		return GameDescriptor(name, description);
-	}
 };
 
 static const GameSettings cine_settings[] = {
@@ -74,12 +65,15 @@
 	{NULL, NULL, 0, 0, NULL}
 };
 
+} // End of namespace Cine
+
+
 GameList Engine_CINE_gameIDList() {
 	GameList games;
-	const GameSettings *g = cine_settings;
+	const Cine::GameSettings *g = Cine::cine_settings;
 
-	while (g->name) {
-		games.push_back(g->toGameDescriptor());
+	while (g->gameid) {
+		games.push_back(*g);
 		g++;
 	}
 
@@ -87,20 +81,20 @@
 }
 
 GameDescriptor Engine_CINE_findGameID(const char *gameid) {
-	const GameSettings *g = cine_settings;
-	while (g->name) {
-		if (0 == scumm_stricmp(gameid, g->name))
+	const Cine::GameSettings *g = Cine::cine_settings;
+	while (g->gameid) {
+		if (0 == scumm_stricmp(gameid, g->gameid))
 			break;
 		g++;
 	}
-	return g->toGameDescriptor();
+	return *g;
 }
 
 DetectedGameList Engine_CINE_detectGames(const FSList &fslist) {
 	DetectedGameList detectedGames;
-	const GameSettings *g;
+	const Cine::GameSettings *g;
 
-	for (g = cine_settings; g->name; ++g) {
+	for (g = Cine::cine_settings; g->gameid; ++g) {
 		// Iterate over all files in the given directory
 		for (FSList::const_iterator file = fslist.begin();
 		    file != fslist.end(); ++file) {
@@ -108,7 +102,7 @@
 
 			if (0 == scumm_stricmp(g->detectname, gameName)) {
 				// Match found, add to list of candidates, then abort inner loop.
-				detectedGames.push_back(g->toGameDescriptor());
+				detectedGames.push_back(*g);
 				break;
 			}
 		}
@@ -134,10 +128,10 @@
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 
-	const GameSettings *g;
+	const Cine::GameSettings *g;
 
-	for (g = cine_settings; g->name; ++g)
-		if (!scumm_stricmp(g->name, detector->_targetName.c_str()))
+	for (g = Cine::cine_settings; g->gameid; ++g)
+		if (!scumm_stricmp(g->gameid, detector->_targetName.c_str()))
 			_gameId = g->id;
 
 	gameType = _gameId;

Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h	2006-04-09 17:53:47 UTC (rev 21732)
+++ scummvm/trunk/engines/cine/cine.h	2006-04-09 19:44:40 UTC (rev 21733)
@@ -68,8 +68,6 @@
 	}
 };
 
-extern char *savePath;
-
 #define BOOT_PRC_NAME "AUTO00.PRC"
 
 enum {

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2006-04-09 17:53:47 UTC (rev 21732)
+++ scummvm/trunk/engines/cine/various.cpp	2006-04-09 19:44:40 UTC (rev 21733)
@@ -343,7 +343,8 @@
 	return -1;
 }
 
-commandeType currentSaveName[10];
+static commandeType currentSaveName[10];
+static char *savePath;
 
 int16 loadSaveDirectory(void) {
 	Common::File fHandle;


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





More information about the Scummvm-git-logs mailing list