[Scummvm-cvs-logs] SF.net SVN: scummvm: [22117] scummvm/trunk/engines/scumm/resource.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Apr 23 13:03:00 CEST 2006
Revision: 22117
Author: fingolfin
Date: 2006-04-23 13:02:33 -0700 (Sun, 23 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22117&view=rev
Log Message:
-----------
Added a comment regarding COMI disc changing
Modified Paths:
--------------
scummvm/trunk/engines/scumm/resource.cpp
Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp 2006-04-23 19:41:54 UTC (rev 22116)
+++ scummvm/trunk/engines/scumm/resource.cpp 2006-04-23 20:02:33 UTC (rev 22117)
@@ -85,13 +85,15 @@
// Load the disk numer / room offs (special case for room 0 exists because
// room 0 contains the data which is used to create the roomno / roomoffs
// tables -- hence obviously we mustn't use those when loading room 0.
- const int diskNumber = room ? res.roomno[rtRoom][room] : 0;
- const int room_offs = room ? res.roomoffs[rtRoom][room] : 0;
+ const uint32 diskNumber = room ? res.roomno[rtRoom][room] : 0;
+ const uint32 room_offs = room ? res.roomoffs[rtRoom][room] : 0;
// FIXME: Since room_offs is const, clearly the following loop either
// is never entered, or loops forever (if it wasn't for the return/error
// statements in it, that is). -> This should be cleaned up!
- while (room_offs != -1) {
+ // Maybe we should re-enabled the looping properly, to deal with disc
+ // changes in COMI ?
+ while (room_offs != 0xFFFFFFFF) {
if (room_offs != 0 && room != 0 && _game.heversion < 98) {
_fileOffset = res.roomoffs[rtRoom][room];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list