thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Add a Resource class, refactor res code around it

Browse source
This commit is contained in:
Max Horn 2011-05-13 11:45:42 +02:00
parent abaaf0cad9
commit c02420df43
17 changed files with 228 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/saveload.cpp
View file

@ -1247,7 +1247,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
s->saveUint16(type); // Save the res type...
for (idx = 0; idx < _res->_types[type]._num; idx++) {
// Only save resources which actually exist...
if (_res->_types[type]._address[idx]) {
if (_res->_types[type]._resources[idx]._address) {
s->saveUint16(idx); // Save the index of the resource
saveResource(s, type, idx);
}
@ -1663,11 +1663,11 @@ void ScummEngine::loadResourceOLD(Serializer *ser, int type, int idx) {
}
void ScummEngine::saveResource(Serializer *ser, int type, int idx) {
assert(_res->_types[type]._address[idx]);
assert(_res->_types[type]._resources[idx]._address);
if (_res->_types[type]._mode == kDynamicResTypeMode) {
byte *ptr = _res->_types[type]._address[idx];
uint32 size = _res->_types[type]._size[idx];
byte *ptr = _res->_types[type]._resources[idx]._address;
uint32 size = _res->_types[type]._resources[idx]._size;
ser->saveUint32(size);
ser->saveBytes(ptr, size);