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.)

svn-id: r21947

2 files changed, 7 insertions, 32 deletions

diff --git a/engines/simon/res.cpp b/engines/simon/res.cpp
index a09f6d6b10..8e72318400 100644
--- a/engines/simon/res.cpp
+++ b/engines/simon/res.cpp
@@ -201,14 +201,7 @@ void SimonEngine::loadGamePcFile(const char *filename) {
 	/* 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 @@ void SimonEngine::loadGamePcFile(const char *filename) {
 	/* 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();
diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp
index 4dd7df3b04..87e1151dd0 100644
--- a/engines/simon/sound.cpp
+++ b/engines/simon/sound.cpp
@@ -389,17 +389,9 @@ void Sound::readSfxFile(const char *filename) {
 	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 @@ void Sound::readVoiceFile(const char *filename) {
 	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;