aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorJoost Peters2005-03-06 22:35:12 +0000
committerJoost Peters2005-03-06 22:35:12 +0000
commit89ecfa29ba3a8e68032b109a2978d1ea913424df (patch)
tree1cf97e7eeb03bc9a46e54370cd51223c3ead06b4 /queen
parente630d450ed895e2236376198ba977bc837828d51 (diff)
downloadscummvm-rg350-89ecfa29ba3a8e68032b109a2978d1ea913424df.tar.gz
scummvm-rg350-89ecfa29ba3a8e68032b109a2978d1ea913424df.tar.bz2
scummvm-rg350-89ecfa29ba3a8e68032b109a2978d1ea913424df.zip
Might as well return the GameSetting directly
svn-id: r17013
Diffstat (limited to 'queen')
-rw-r--r--queen/queen.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 5efb1695ae..cfa5c3b0db 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -70,20 +70,20 @@ GameList Engine_QUEEN_gameList() {
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 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
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);