[Scummvm-cvs-logs] SF.net SVN: scummvm: [21036] scummvm/trunk/engines/scumm

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Mar 3 06:46:01 CET 2006


Revision: 21036
Author:   fingolfin
Date:     2006-03-03 06:44:50 -0800 (Fri, 03 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21036&view=rev

Log Message:
-----------
String constants are const -> fixing compiler warnings

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/util.cpp
    scummvm/trunk/engines/scumm/util.h
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-03-03 14:35:18 UTC (rev 21035)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-03-03 14:44:50 UTC (rev 21036)
@@ -447,7 +447,7 @@
 		_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";

Modified: scummvm/trunk/engines/scumm/util.cpp
===================================================================
--- scummvm/trunk/engines/scumm/util.cpp	2006-03-03 14:35:18 UTC (rev 21035)
+++ scummvm/trunk/engines/scumm/util.cpp	2006-03-03 14:44:50 UTC (rev 21036)
@@ -1567,7 +1567,7 @@
 };
 
 
-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;
 

Modified: scummvm/trunk/engines/scumm/util.h
===================================================================
--- scummvm/trunk/engines/scumm/util.h	2006-03-03 14:35:18 UTC (rev 21035)
+++ scummvm/trunk/engines/scumm/util.h	2006-03-03 14:44:50 UTC (rev 21036)
@@ -142,7 +142,7 @@
 	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);







More information about the Scummvm-git-logs mailing list