From 23a0f5318c50cdf3dce19e4de0c98fb5ae1c2618 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Sun, 7 Aug 2011 11:39:54 +0200
Subject: JANITORIAL: Remove trailing empty lines.

---
 engines/kyra/saveload.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/kyra/saveload.cpp')

diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 80182d949b..f41cf0c6e3 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -268,4 +268,3 @@ void KyraEngine_v1::loadGameStateCheck(int slot) {
 }
 
 } // End of namespace Kyra
-
-- 
cgit v1.2.3


From e35b4f20c1041b13361aa2ebc4e758873bb1cee3 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Sun, 7 Aug 2011 14:35:01 +0200
Subject: GRAPHICS: Simplify the interface of Graphics::loadThumbnail().

Now it returns the Surface, so the caller does not need to create one and pass it.
---
 engines/kyra/saveload.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'engines/kyra/saveload.cpp')

diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index f41cf0c6e3..42c5d3e8a8 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -113,12 +113,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 
 	if (header.version >= 14) {
 		if (loadThumbnail) {
-			header.thumbnail = new Graphics::Surface();
-			assert(header.thumbnail);
-			if (!Graphics::loadThumbnail(*in, *header.thumbnail)) {
-				delete header.thumbnail;
-				header.thumbnail = 0;
-			}
+			header.thumbnail = Graphics::loadThumbnail(*in);
 		} else {
 			Graphics::skipThumbnail(*in);
 		}
-- 
cgit v1.2.3