From 3047e084c1402af4f7643b718e655532c0e2c892 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 2 Aug 2008 22:51:53 +0000
Subject: Fix for bug #1945335: "SCUMM: Invalid charset id can be stored".
 Regressions possible.

svn-id: r33552
---
 engines/scumm/scumm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.h')

diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 20824ffe74..4aff84d727 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -560,7 +560,7 @@ protected:
 public:
 	int _numLocalScripts, _numImages, _numRooms, _numScripts, _numSounds;	// Used by HE games
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette
-	int _numCharsets;	// FIXME - should be protected, used by CharsetRenderer
+	int32 _numCharsets;	// FIXME - should be protected, used by CharsetRenderer
 
 	BaseCostumeLoader *_costumeLoader;
 	BaseCostumeRenderer *_costumeRenderer;
-- 
cgit v1.2.3


From 5f4c9f913f60d1098cbe527a9a4acabd39c5c23b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 4 Aug 2008 11:38:25 +0000
Subject: Turned InSaveFile & OutSaveFile into simple typedefs

svn-id: r33606
---
 engines/scumm/scumm.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/scumm.h')

diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 4aff84d727..5011781820 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -46,7 +46,7 @@ namespace GUI {
 using GUI::Dialog;
 namespace Common {
 	class SeekableReadStream;
-	class OutSaveFile;
+	class WriteStream;
 }
 
 namespace Scumm {
@@ -637,8 +637,8 @@ public:
 protected:
 	Graphics::Surface *loadThumbnail(Common::SeekableReadStream *file);
 	bool loadInfos(Common::SeekableReadStream *file, InfoStuff *stuff);
-	void saveThumbnail(Common::OutSaveFile *file);
-	void saveInfos(Common::OutSaveFile* file);
+	void saveThumbnail(Common::WriteStream *file);
+	void saveInfos(Common::WriteStream* file);
 
 	int32 _engineStartTime;
 	int32 _pauseStartTime;
-- 
cgit v1.2.3