aboutsummaryrefslogtreecommitdiff
path: root/engines/simon/res.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-04-16 16:56:11 +0000
committerTorbjörn Andersson2006-04-16 16:56:11 +0000
commit75e851777b71b04576b255864e65159faaa79ebd (patch)
treea02f11f7b7c06945383035d2a76ad6ae547a6fbf /engines/simon/res.cpp
parentd5909ee1228a3f7527642ae1a6ec441273dccc4c (diff)
downloadscummvm-rg350-75e851777b71b04576b255864e65159faaa79ebd.tar.gz
scummvm-rg350-75e851777b71b04576b255864e65159faaa79ebd.tar.bz2
scummvm-rg350-75e851777b71b04576b255864e65159faaa79ebd.zip
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
Diffstat (limited to 'engines/simon/res.cpp')
-rw-r--r--engines/simon/res.cpp13
1 files changed, 2 insertions, 11 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();