aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/resource.cpp
diff options
context:
space:
mode:
authorStrangerke2015-12-20 17:21:55 +0100
committerWillem Jan Palenstijn2015-12-23 21:35:32 +0100
commitb53735ba064012b3c981d5ef497d5f8c2e974291 (patch)
tree256e3ae0afde08b4cd19bf1e62eeb3b93144c4ab /engines/lab/resource.cpp
parent2edd0c51425db5e4407d38dbbeea788173f383b5 (diff)
downloadscummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.tar.gz
scummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.tar.bz2
scummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.zip
LAB: Constify some parameters
Diffstat (limited to 'engines/lab/resource.cpp')
-rw-r--r--engines/lab/resource.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index a9d8441984..b5ecb0b2bc 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -164,43 +164,44 @@ void Resource::freeViews(uint16 roomNum) {
freeRule(_vm->_rooms[roomNum]._rules);
}
-Common::String Resource::translateFileName(Common::String filename) {
- filename.toUppercase();
+Common::String Resource::translateFileName(const Common::String filename) {
+ Common::String upperFilename = filename;
+ upperFilename.toUppercase();
Common::String fileNameStrFinal;
- if (filename.hasPrefix("P:") || filename.hasPrefix("F:")) {
+ if (upperFilename.hasPrefix("P:") || upperFilename.hasPrefix("F:")) {
if (_vm->_isHiRes)
fileNameStrFinal = "GAME/SPICT/";
else
fileNameStrFinal = "GAME/PICT/";
if (_vm->getPlatform() == Common::kPlatformAmiga) {
- if (filename.hasPrefix("P:")) {
+ if (upperFilename.hasPrefix("P:")) {
fileNameStrFinal = "PICT/";
} else {
fileNameStrFinal = "LABFONTS/";
- filename += "T"; // all the Amiga fonts have a ".FONT" suffix
+ upperFilename += "T"; // all the Amiga fonts have a ".FONT" suffix
}
}
- } else if (filename.hasPrefix("LAB:")) {
+ } else if (upperFilename.hasPrefix("LAB:")) {
if (_vm->getPlatform() != Common::kPlatformAmiga)
fileNameStrFinal = "GAME/";
- } else if (filename.hasPrefix("MUSIC:")) {
+ } else if (upperFilename.hasPrefix("MUSIC:")) {
if (_vm->getPlatform() != Common::kPlatformAmiga)
fileNameStrFinal = "GAME/MUSIC/";
else
fileNameStrFinal = "MUSIC/";
}
- if (filename.contains(':')) {
- while (filename[0] != ':') {
- filename.deleteChar(0);
+ if (upperFilename.contains(':')) {
+ while (upperFilename[0] != ':') {
+ upperFilename.deleteChar(0);
}
- filename.deleteChar(0);
+ upperFilename.deleteChar(0);
}
- fileNameStrFinal += filename;
+ fileNameStrFinal += upperFilename;
return fileNameStrFinal;
}