[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.120,1.121
Joost Peters
joostp at users.sourceforge.net
Sun Mar 6 13:45:29 CET 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29337/queen
Modified Files:
queen.cpp
Log Message:
cleanup
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- queen.cpp 6 Mar 2005 18:08:46 -0000 1.120
+++ queen.cpp 6 Mar 2005 21:44:40 -0000 1.121
@@ -70,16 +70,20 @@
return games;
}
-bool isDemo(uint32 size) {
+uint8 whichTarget(uint32 size) {
+ uint8 target = 0;
switch(size) {
- case 1915913: //interview
- case 3724538:
+ case 3724538: //regular demo
case 3732177:
- return true;
- default:
- return false;
+ target = 1;
+ break;
+ case 1915913: //interview demo
+ target = 2;
+ break;
+ default: //non-demo
+ break;
}
- return false;
+ return target;
}
DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
@@ -91,19 +95,12 @@
const char *gameName = file->displayName().c_str();
if (0 == scumm_stricmp("queen.1", gameName) || 0 == scumm_stricmp("queen.1c", gameName)) {
- // Match found, add to list of candidates, then abort loop.
-
File dataFile;
dataFile.open(file->path().c_str());
assert(dataFile.isOpen());
if (0 == scumm_stricmp("queen.1", gameName)) { //an unmodified file
- if (isDemo(dataFile.size())) { //is it a demo?
- uint8 whichDemo = dataFile.size() == 1915913 ? 2 : 1;
- detectedGames.push_back(queen_setting[whichDemo]);
- } else { //must be a full game then
- detectedGames.push_back(queen_setting[0]);
- }
+ detectedGames.push_back(queen_setting[whichTarget(dataFile.size())]);
} else if (0 == scumm_stricmp("queen.1c", gameName)) { //oh joy, it's a rebuilt file
char header[9];
dataFile.read(header, 9);
@@ -120,7 +117,6 @@
}
dataFile.close();
-
break;
}
}
More information about the Scummvm-git-logs
mailing list