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

GRAPHICS: Renamed skipThumbnailHeader to skipThumbnail.

Browse source 
svn-id: r51668
This commit is contained in:
Johannes Schickel 2010-08-02 22:28:30 +00:00
parent 0dba655085
commit 4e33b7a3be
6 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/kyra/saveload.cpp
View file

@ -122,7 +122,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
header.thumbnail = 0; header.thumbnail = 0;
} }
} else { } else {
Graphics::skipThumbnailHeader(*in); Graphics::skipThumbnail(*in);
} }
} }

2
engines/sci/engine/savegame.cpp
View file

@ -748,7 +748,7 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
} }
// We don't need the thumbnail here, so just read it and discard it // We don't need the thumbnail here, so just read it and discard it
Graphics::skipThumbnailHeader(*fh); Graphics::skipThumbnail(*fh);
s->reset(true); s->reset(true);
s->saveLoadWithSerializer(ser); // FIXME: Error handling? s->saveLoadWithSerializer(ser); // FIXME: Error handling?

4
engines/scumm/saveload.cpp
View file

@ -364,7 +364,7 @@ bool ScummEngine::loadState(int slot, bool compat) {
} }
} }
Graphics::skipThumbnailHeader(*in); Graphics::skipThumbnail(*in);
} }
// Since version 56 we save additional information about the creation of // Since version 56 we save additional information about the creation of
@ -721,7 +721,7 @@ bool ScummEngine::loadInfosFromSlot(const char *target, int slot, InfoStuff *stu
return false; return false;
} }
if (!Graphics::skipThumbnailHeader(*in)) { if (!Graphics::skipThumbnail(*in)) {
delete in; delete in;
return false; return false;
} }

3
engines/sword1/control.cpp
View file

@ -1175,8 +1175,7 @@ bool Control::restoreGameFromFile(uint8 slot) {
if (saveVersion < 2) // These older version of the savegames used a flag to signal presence of thumbnail if (saveVersion < 2) // These older version of the savegames used a flag to signal presence of thumbnail
inf->skip(1); inf->skip(1);
if (Graphics::checkThumbnailHeader(*inf)) Graphics::skipThumbnail(*inf);
Graphics::skipThumbnailHeader(*inf);
inf->readUint32BE(); // save date inf->readUint32BE(); // save date
inf->readUint16BE(); // save time inf->readUint16BE(); // save time

2
graphics/thumbnail.cpp
View file

@ -82,7 +82,7 @@ bool checkThumbnailHeader(Common::SeekableReadStream &in) {
return hasHeader; return hasHeader;
} }
bool skipThumbnailHeader(Common::SeekableReadStream &in) { bool skipThumbnail(Common::SeekableReadStream &in) {
uint32 position = in.pos(); uint32 position = in.pos();
ThumbnailHeader header; ThumbnailHeader header;

4
graphics/thumbnail.h
View file

@ -39,11 +39,11 @@ namespace Graphics {
bool checkThumbnailHeader(Common::SeekableReadStream &in); bool checkThumbnailHeader(Common::SeekableReadStream &in);
/** /**
* Skips a thumbnail header, if present. * Skips a thumbnail, if present.
* *
* @param in stream to process * @param in stream to process
*/ */
bool skipThumbnailHeader(Common::SeekableReadStream &in); bool skipThumbnail(Common::SeekableReadStream &in);
/** /**
* Lodas a thumbnail from the given input stream. * Lodas a thumbnail from the given input stream.