[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.312,1.313
Max Horn
fingolfin at users.sourceforge.net
Sun Apr 10 10:38:48 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22719
Modified Files:
resource.cpp
Log Message:
cleanup
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- resource.cpp 10 Apr 2005 13:16:48 -0000 1.312
+++ resource.cpp 10 Apr 2005 17:38:09 -0000 1.313
@@ -46,7 +46,7 @@
/* Open a room */
-void ScummEngine::openRoom(int room) {
+void ScummEngine::openRoom(const int room) {
int room_offs;
bool result;
char buf[128];
@@ -68,6 +68,8 @@
return;
}
+ const int diskNumber = (room == 0 ? 0 : res.roomno[rtRoom][room]);
+
/* Either xxx.lfl or monkey.xxx file name */
while (1) {
room_offs = room ? res.roomoffs[rtRoom][room] : 0;
@@ -92,10 +94,10 @@
if (openResourceFile(buf, encByte)) {
return;
}
- askForDisk(buf, room == 0 ? 0 : res.roomno[rtRoom][room]);
+ askForDisk(buf, diskNumber);
} else {
- sprintf(buf, "disk%.2d.lec", room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf, "disk%.2d.lec", diskNumber);
encByte = 0x69;
}
} else {
@@ -121,15 +123,15 @@
} else if (_version >= 7) {
if (room > 0 && (_version == 8))
VAR(VAR_CURRENTDISK) = res.roomno[rtRoom][room];
- sprintf(buf, "%s.la%d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf, "%s.la%d", _gameName.c_str(), diskNumber);
- sprintf(buf2, "%s.%.3d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf2, "%s.%.3d", _gameName.c_str(), diskNumber);
} else if (_features & GF_HUMONGOUS) {
- sprintf(buf, "%s.he%.1d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf, "%s.he%.1d", _gameName.c_str(), diskNumber);
} else {
- sprintf(buf, "%s.%.3d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf, "%s.%.3d", _gameName.c_str(), diskNumber);
if (_gameId == GID_SAMNMAX)
- sprintf(buf2, "%s.sm%.1d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
+ sprintf(buf2, "%s.sm%.1d", _gameName.c_str(), diskNumber);
}
encByte = (_features & GF_USE_KEY) ? 0x69 : 0;
@@ -166,7 +168,7 @@
error("Room %d not in %s", room, buf);
return;
}
- askForDisk(buf, room == 0 ? 0 : res.roomno[rtRoom][room]);
+ askForDisk(buf, diskNumber);
}
do {
@@ -174,7 +176,7 @@
encByte = 0;
if (openResourceFile(buf, encByte))
break;
- askForDisk(buf, room == 0 ? 0 : res.roomno[rtRoom][room]);
+ askForDisk(buf, diskNumber);
} while (1);
deleteRoomOffsets();
More information about the Scummvm-git-logs
mailing list