[Scummvm-cvs-logs] SF.net SVN: scummvm: [21947] scummvm/trunk/engines/simon

[eriktorbjorn at users.sourceforge.net]

Revision: 21947
Author:   eriktorbjorn
Date:     2006-04-16 09:56:11 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21947&view=rev

Log Message:
-----------
The File class automatically tries adding "." to a filename if the file cannot
be found, so there's no need for the Simon engine to do it. (Though the game
detector still does at the moment.)

Modified Paths:
--------------
    scummvm/trunk/engines/simon/res.cpp
    scummvm/trunk/engines/simon/sound.cpp
Modified: scummvm/trunk/engines/simon/res.cpp
===================================================================
--- scummvm/trunk/engines/simon/res.cpp	2006-04-16 14:40:12 UTC (rev 21946)
+++ scummvm/trunk/engines/simon/res.cpp	2006-04-16 16:56:11 UTC (rev 21947)
@@ -201,14 +201,7 @@
 	/* read main gamepc file */
 	in.open(filename);
 	if (in.isOpen() == false) {
-		char *filename2;
-		filename2 = (char *)malloc(strlen(filename) + 2);
-		strcpy(filename2, filename);
-		strcat(filename2, ".");
-		in.open(filename2);
-		free(filename2);
-		if (in.isOpen() == false)
-			error("Can't open gamepc file '%s' or '%s.'", gss->gamepc_filename, gss->gamepc_filename);
+		error("Can't open gamepc file '%s'", gss->gamepc_filename);
 	}
 
 	num_inited_objects = allocGamePcVars(&in);
@@ -227,9 +220,7 @@
 	/* Read list of TABLE resources */
 	in.open("TBLLIST");
 	if (in.isOpen() == false) {
-		in.open("TBLLIST.");
-		if (in.isOpen() == false)
-			error("Can't open table resources file 'TBLLIST' or 'TBLLIST.'");
+		error("Can't open table resources file 'TBLLIST'");
 	}
 
 	file_size = in.size();

Modified: scummvm/trunk/engines/simon/sound.cpp
===================================================================
--- scummvm/trunk/engines/simon/sound.cpp	2006-04-16 14:40:12 UTC (rev 21946)
+++ scummvm/trunk/engines/simon/sound.cpp	2006-04-16 16:56:11 UTC (rev 21947)
@@ -389,17 +389,9 @@
 	file->open(filename);
 
 	if (file->isOpen() == false) {
-		char *filename2;
-		filename2 = (char *)malloc(strlen(filename) + 2);
-		strcpy(filename2, filename);
-		strcat(filename2, ".");
-		file->open(filename2);
-		free(filename2);
-		if (file->isOpen() == false) {
-			if (atoi(filename + 6) != 1 && atoi(filename + 6) != 30)
-				warning("readSfxFile: Can't load sfx file %s", filename);
-			return;
-		}
+		if (atoi(filename + 6) != 1 && atoi(filename + 6) != 30)
+			warning("readSfxFile: Can't load sfx file %s", filename);
+		return;
 	}
 
 	delete _effects;
@@ -425,16 +417,8 @@
 	file->open(filename);
 
 	if (file->isOpen() == false) {
-		char *filename2;
-		filename2 = (char *)malloc(strlen(filename) + 2);
-		strcpy(filename2, filename);
-		strcat(filename2, ".");
-		file->open(filename2);
-		free(filename2);
-		if (file->isOpen() == false) {
-			warning("readVoiceFile: Can't load voice file %s", filename);
-			return;
-		}
+		warning("readVoiceFile: Can't load voice file %s", filename);
+		return;
 	}
 
 	delete _voice;


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