minor cleanup

svn-id: r3476

2 files changed, 5 insertions, 7 deletions

diff --git a/resource.cpp b/resource.cpp
index 2e601e8348..2fbe0646ac 100644
--- a/resource.cpp
+++ b/resource.cpp
@@ -58,11 +58,9 @@ void Scumm::openRoom(int room) {
 			_fileOffset = _roomFileOffsets[room];
 			return;
 		}
-		if (room==0) {
-			sprintf(buf, "%s.000", _exe_name);
-		} else {
-			sprintf(buf, "%s.%.3d", _exe_name, res.roomno[1][room]);
-		}
+		sprintf(buf, "%s.%.3d", _exe_name, 
+			room==0 ? 0 : res.roomno[rtRoom][room]);
+
 		_encbyte = 0x69;
 		if (openResourceFile(buf)) {
 			if (room==0)
diff --git a/scummvm.cpp b/scummvm.cpp
index 9bb0281061..f9cf4d394e 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -409,8 +409,8 @@ NextArg:;
 
 
 struct VersionSettings {
-	char *filename;
-	char *gamename;
+	const char *filename;
+	const char *gamename;
 	byte id,major,middle,minor;
 };