From 86565fcca57454e91124410cfd6864ef1e202dc0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 9 Mar 2006 02:52:51 +0000
Subject: - Renamed GameSettings to PlainGameDescriptor - Added new
 GameDescriptor struct (similar to PlainGameDescriptor but with  
 Common::String members instead of const char * ones) - Changed DetectedGame
 to subclass GameDescriptor - Removed toGameSettings() in favor of new
 (template) constructors in   DetectedGame and GameDescriptor - Fixed a bug in
 the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
---
 engines/sword2/sword2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sword2/sword2.cpp')

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index a8c9c635e5..8d74e94e45 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -67,20 +67,20 @@ GameList Engine_SWORD2_gameIDList() {
 	const Sword2GameSettings *g = sword2_settings;
 	GameList games;
 	while (g->gameid) {
-		games.push_back(toGameSettings(*g));
+		games.push_back(*g);
 		g++;
 	}
 	return games;
 }
 
-GameSettings Engine_SWORD2_findGameID(const char *gameid) {
+GameDescriptor Engine_SWORD2_findGameID(const char *gameid) {
 	const Sword2GameSettings *g = sword2_settings;
 	while (g->gameid) {
 		if (0 == scumm_stricmp(gameid, g->gameid))
 			break;
 		g++;
 	}
-	return toGameSettings(*g);
+	return *g;
 }
 
 DetectedGameList Engine_SWORD2_detectGames(const FSList &fslist) {
@@ -99,7 +99,7 @@ DetectedGameList Engine_SWORD2_detectGames(const FSList &fslist) {
 
 				if (0 == scumm_stricmp(g->detectname, gameName)) {
 					// Match found, add to list of candidates, then abort inner loop.
-					detectedGames.push_back(toDetectedGame(*g));
+					detectedGames.push_back(*g);
 					break;
 				}
 			}
-- 
cgit v1.2.3