aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-08-02 22:28:30 +0000
committerJohannes Schickel2010-08-02 22:28:30 +0000
commit4e33b7a3befbc4d14cdb57ac8da8c205ca724cb0 (patch)
treea758f8c19a3d1c12822c1f979c0409a4071ca8ab
parent0dba655085e3c5f025ae111be4929d5a9250d95a (diff)
downloadscummvm-rg350-4e33b7a3befbc4d14cdb57ac8da8c205ca724cb0.tar.gz
scummvm-rg350-4e33b7a3befbc4d14cdb57ac8da8c205ca724cb0.tar.bz2
scummvm-rg350-4e33b7a3befbc4d14cdb57ac8da8c205ca724cb0.zip
GRAPHICS: Renamed skipThumbnailHeader to skipThumbnail.
svn-id: r51668
-rw-r--r--engines/kyra/saveload.cpp2
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/scumm/saveload.cpp4
-rw-r--r--engines/sword1/control.cpp3
-rw-r--r--graphics/thumbnail.cpp2
-rw-r--r--graphics/thumbnail.h4
6 files changed, 8 insertions, 9 deletions
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 959d89f0ad..56e1c73d0a 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -122,7 +122,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
header.thumbnail = 0;
}
} else {
- Graphics::skipThumbnailHeader(*in);
+ Graphics::skipThumbnail(*in);
}
}
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 10a2cbd569..0b0072432f 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -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
- Graphics::skipThumbnailHeader(*fh);
+ Graphics::skipThumbnail(*fh);
s->reset(true);
s->saveLoadWithSerializer(ser); // FIXME: Error handling?
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 762b38fba2..3cc619f630 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -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
@@ -721,7 +721,7 @@ bool ScummEngine::loadInfosFromSlot(const char *target, int slot, InfoStuff *stu
return false;
}
- if (!Graphics::skipThumbnailHeader(*in)) {
+ if (!Graphics::skipThumbnail(*in)) {
delete in;
return false;
}
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index d6a04513a8..8d9ca85829 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -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
inf->skip(1);
- if (Graphics::checkThumbnailHeader(*inf))
- Graphics::skipThumbnailHeader(*inf);
+ Graphics::skipThumbnail(*inf);
inf->readUint32BE(); // save date
inf->readUint16BE(); // save time
diff --git a/graphics/thumbnail.cpp b/graphics/thumbnail.cpp
index 4c8ce289cf..ccde78806d 100644
--- a/graphics/thumbnail.cpp
+++ b/graphics/thumbnail.cpp
@@ -82,7 +82,7 @@ bool checkThumbnailHeader(Common::SeekableReadStream &in) {
return hasHeader;
}
-bool skipThumbnailHeader(Common::SeekableReadStream &in) {
+bool skipThumbnail(Common::SeekableReadStream &in) {
uint32 position = in.pos();
ThumbnailHeader header;
diff --git a/graphics/thumbnail.h b/graphics/thumbnail.h
index b3fdb70b95..0465173364 100644
--- a/graphics/thumbnail.h
+++ b/graphics/thumbnail.h
@@ -39,11 +39,11 @@ namespace Graphics {
bool checkThumbnailHeader(Common::SeekableReadStream &in);
/**
- * Skips a thumbnail header, if present.
+ * Skips a thumbnail, if present.
*
* @param in stream to process
*/
-bool skipThumbnailHeader(Common::SeekableReadStream &in);
+bool skipThumbnail(Common::SeekableReadStream &in);
/**
* Lodas a thumbnail from the given input stream.