aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-03-03 14:44:50 +0000
committerMax Horn2006-03-03 14:44:50 +0000
commit5d3ef6aec29b9cd8e8d7172150618d416d2cb29a (patch)
tree45c81a1bd6ddcc26b6f9876f51ead1430e09b135
parent5e1f3fa2fa16a553af06ba0af46a7e852ef24c4d (diff)
downloadscummvm-rg350-5d3ef6aec29b9cd8e8d7172150618d416d2cb29a.tar.gz
scummvm-rg350-5d3ef6aec29b9cd8e8d7172150618d416d2cb29a.tar.bz2
scummvm-rg350-5d3ef6aec29b9cd8e8d7172150618d416d2cb29a.zip
String constants are const -> fixing compiler warnings
svn-id: r21036
-rw-r--r--engines/scumm/scumm.cpp2
-rw-r--r--engines/scumm/util.cpp2
-rw-r--r--engines/scumm/util.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8a804fcb09..cf6fd2257e 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -447,7 +447,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_fileHandle = new ScummNESFile();
_containerFile = tmpBuf;
} else if ((_game.platform == Common::kPlatformC64) && _substResFileName.winName) {
- char *tmpBuf1, *tmpBuf2;
+ const char *tmpBuf1, *tmpBuf2;
if (_game.id == GID_MANIAC) {
tmpBuf1 = "maniac1.d64";
tmpBuf2 = "maniac2.d64";
diff --git a/engines/scumm/util.cpp b/engines/scumm/util.cpp
index 70e3a3e467..e33bcfd6e8 100644
--- a/engines/scumm/util.cpp
+++ b/engines/scumm/util.cpp
@@ -1567,7 +1567,7 @@ static const int zakResourcesPerFile[59] = {
};
-ScummC64File::ScummC64File(char *disk1, char *disk2, bool maniac) : _stream(0), _buf(0), _maniac(maniac) {
+ScummC64File::ScummC64File(const char *disk1, const char *disk2, bool maniac) : _stream(0), _buf(0), _maniac(maniac) {
_disk1 = disk1;
_disk2 = disk2;
diff --git a/engines/scumm/util.h b/engines/scumm/util.h
index 99d75cf127..81b3538d21 100644
--- a/engines/scumm/util.h
+++ b/engines/scumm/util.h
@@ -142,7 +142,7 @@ private:
uint16 fileReadUint16LE();
public:
- ScummC64File(char *disk1, char *disk2, bool maniac);
+ ScummC64File(const char *disk1, const char *disk2, bool maniac);
void setEnc(byte value);
bool open(const char *filename, AccessMode mode = kFileReadMode);