Merge remote-tracking branch 'origin/master' into soltys_wip2

5 files changed, 7 insertions, 7 deletions

diff --git a/engines/sword25/gfx/animationtemplateregistry.cpp b/engines/sword25/gfx/animationtemplateregistry.cpp
index 43c099c89d..8184b49eba 100644
--- a/engines/sword25/gfx/animationtemplateregistry.cpp
+++ b/engines/sword25/gfx/animationtemplateregistry.cpp
@@ -34,7 +34,9 @@
 #include "sword25/gfx/animationtemplateregistry.h"
 #include "sword25/gfx/animationtemplate.h"
 
+namespace Common {
 DECLARE_SINGLETON(Sword25::AnimationTemplateRegistry);
+}
 
 namespace Sword25 {
 
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp
index 91133b9fd2..14ba032107 100644
--- a/engines/sword25/gfx/graphicengine.cpp
+++ b/engines/sword25/gfx/graphicengine.cpp
@@ -156,7 +156,7 @@ RenderObjectPtr<Panel> GraphicEngine::getMainPanel() {
 }
 
 void GraphicEngine::setVsync(bool vsync) {
-	warning("STUB: SetVsync(%d)", vsync);
+	// ScummVM has no concept of VSync
 }
 
 bool GraphicEngine::getVsync() const {
diff --git a/engines/sword25/gfx/image/art.cpp b/engines/sword25/gfx/image/art.cpp
index e9715481c6..2ba102e779 100644
--- a/engines/sword25/gfx/image/art.cpp
+++ b/engines/sword25/gfx/image/art.cpp
@@ -2030,7 +2030,6 @@ static void art_svp_intersect_add_seg(ArtIntersectCtx *ctx, const ArtSVPSeg *in_
 	ArtActiveSeg *seg = art_new(ArtActiveSeg, 1);
 	ArtActiveSeg *test;
 	double x0, y0;
-	ArtActiveSeg *beg_range;
 	ArtActiveSeg *last = NULL;
 	ArtActiveSeg *left, *right;
 	ArtPriPoint *pri_pt = art_new(ArtPriPoint, 1);
@@ -2058,7 +2057,6 @@ static void art_svp_intersect_add_seg(ArtIntersectCtx *ctx, const ArtSVPSeg *in_
 
 	x0 = in_seg->points[0].x;
 	y0 = in_seg->points[0].y;
-	beg_range = NULL;
 	for (test = ctx->active_head; test != NULL; test = test->right) {
 		double d;
 		int test_bneg = test->flags & ART_ACTIVE_FLAGS_BNEG;
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp
index f5f33d8e02..3b29b0333f 100644
--- a/engines/sword25/gfx/image/renderedimage.cpp
+++ b/engines/sword25/gfx/image/renderedimage.cpp
@@ -72,7 +72,10 @@ static byte *readSavegameThumbnail(const Common::String &filename, uint &fileSiz
 
 	// Seek to the actual PNG image
 	loadString(*file);		// Marker (BS25SAVEGAME)
-	loadString(*file);		// Version
+	Common::String storedVersionID = loadString(*file);		// Version
+	if (storedVersionID != "SCUMMVM1")
+		loadString(*file);
+
 	loadString(*file);		// Description
 	uint32 compressedGamedataSize = atoi(loadString(*file).c_str());
 	loadString(*file);		// Uncompressed game data size
diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp
index b9ce5f7e00..45d43c465e 100644
--- a/engines/sword25/gfx/image/vectorimage.cpp
+++ b/engines/sword25/gfx/image/vectorimage.cpp
@@ -247,9 +247,6 @@ VectorImage::VectorImage(const byte *pFileData, uint fileSize, bool &success, co
 		return;
 	}
 
-	// readout SWF size
-	Common::Rect movieRect = flashRectToBSRect(bs);
-
 	// Get frame rate and frame count
 	/* uint32 frameRate = */
 	bs.getUInt16();