thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r11022
This commit is contained in:
Max Horn 2003-11-01 16:03:13 +00:00
parent 6a50ad9fbd
commit 2c2866641b
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scumm/scummvm.cpp
View file

@ -2755,7 +2755,6 @@ GameList Engine_SCUMM_detectGames(const FSList &fslist) {
const ScummGameSettings *g; const ScummGameSettings *g;
char detectName[128]; char detectName[128];
char detectName2[128]; char detectName2[128];
char detectName3[128];
for (g = scumm_settings; g->gameName; ++g) { for (g = scumm_settings; g->gameName; ++g) {
// Determine the 'detectname' for this game, that is, the name of a // Determine the 'detectname' for this game, that is, the name of a
@ -2765,17 +2764,16 @@ GameList Engine_SCUMM_detectGames(const FSList &fslist) {
strcpy(detectName, g->detectname); strcpy(detectName, g->detectname);
strcpy(detectName2, g->detectname); strcpy(detectName2, g->detectname);
strcat(detectName2, "."); strcat(detectName2, ".");
detectName3[0] = '\0';
} else { } else {
strcpy(detectName, g->gameName); strcpy(detectName, g->gameName);
strcpy(detectName2, g->gameName);
strcpy(detectName3, g->gameName);
strcat(detectName, ".000"); strcat(detectName, ".000");
if (g->version >= 7) { strcpy(detectName2, g->gameName);
if (g->features & GF_HUMONGOUS) {
strcat(detectName2, ".he0");
} else if (g->version >= 7) {
strcat(detectName2, ".la0"); strcat(detectName2, ".la0");
} else } else
strcat(detectName2, ".sm0"); strcat(detectName2, ".sm0");
strcat(detectName3, ".he0");
} }
// Iterate over all files in the given directory // Iterate over all files in the given directory
@ -2783,8 +2781,7 @@ GameList Engine_SCUMM_detectGames(const FSList &fslist) {
const char *gameName = file->displayName().c_str(); const char *gameName = file->displayName().c_str();
if ((0 == scumm_stricmp(detectName, gameName)) || if ((0 == scumm_stricmp(detectName, gameName)) ||
(0 == scumm_stricmp(detectName2, gameName)) || (0 == scumm_stricmp(detectName2, gameName))) {
(0 == scumm_stricmp(detectName3, gameName))) {
// Match found, add to list of candidates, then abort inner loop. // Match found, add to list of candidates, then abort inner loop.
detectedGames.push_back(g->toGameSettings()); detectedGames.push_back(g->toGameSettings());
break; break;