diff options
| author | Eugene Sandulenko | 2005-10-12 22:52:47 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-10-12 22:52:47 +0000 |
| commit | d5b203748af5e98727b1c7c7127dacf8567b50a2 (patch) | |
| tree | 5db1677f4489d2b6344b4c70195dc2b1d31794a5 /scumm | |
| parent | 412693ac70e237591335de18fc93b6113b96b42a (diff) | |
| download | scummvm-rg350-d5b203748af5e98727b1c7c7127dacf8567b50a2.tar.gz scummvm-rg350-d5b203748af5e98727b1c7c7127dacf8567b50a2.tar.bz2 scummvm-rg350-d5b203748af5e98727b1c7c7127dacf8567b50a2.zip | |
o Add fate to obsolete targets. It was just an oversight
o Make generateSubstResFileName more portable. I wonder how it worked in
the past at all.
svn-id: r19057
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 456c01272b..6355463a75 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -125,6 +125,7 @@ static ObsoleteTargets obsoleteTargetsTable[] = { {"digdemo", "dig", NULL}, {"digdemoMac", "dig", "macintosh"}, {"dottdemo", "tentacle", NULL}, + {"fate", "atlantis", NULL}, {"ftMac", "ft", "macintosh"}, {"ftpcdemo", "ft", NULL}, {"ftdemo", "ft", "macintosh"}, @@ -2987,8 +2988,10 @@ static int generateSubstResFileName_(const char *filename, char *buf, int bufsiz if (num == ')') num = filename[strlen(filename) - 2]; - const char *ext = strrchr(filename, '.'); - size_t len = ((int)ext > 0) ? ext - filename : strlen(filename); + const char *ext = NULL; + + ext = strrchr(filename, '.'); + size_t len = (ext != NULL) ? ext - filename : strlen(filename); for (int i = index; i < ARRAYSIZE(substResFileNameTable); i++) { if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) { |