[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.121,1.122
Joost Peters
joostp at users.sourceforge.net
Sun Mar 6 14:35:57 CET 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12467/queen
Modified Files:
queen.cpp
Log Message:
Might as well return the GameSetting directly
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- queen.cpp 6 Mar 2005 21:44:40 -0000 1.121
+++ queen.cpp 6 Mar 2005 22:35:12 -0000 1.122
@@ -70,20 +70,20 @@
return games;
}
-uint8 whichTarget(uint32 size) {
- uint8 target = 0;
+GameSettings determineTarget(uint32 size) {
switch(size) {
case 3724538: //regular demo
case 3732177:
- target = 1;
+ return queen_setting[1];
break;
case 1915913: //interview demo
- target = 2;
+ return queen_setting[2];
break;
default: //non-demo
+ return queen_setting[0];
break;
}
- return target;
+ return queen_setting[0];
}
DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
@@ -100,7 +100,7 @@
assert(dataFile.isOpen());
if (0 == scumm_stricmp("queen.1", gameName)) { //an unmodified file
- detectedGames.push_back(queen_setting[whichTarget(dataFile.size())]);
+ detectedGames.push_back(determineTarget(dataFile.size()));
} else if (0 == scumm_stricmp("queen.1c", gameName)) { //oh joy, it's a rebuilt file
char header[9];
dataFile.read(header, 9);
More information about the Scummvm-git-logs
mailing list