From add321c93049e006c202c67bdb0170b8bca83833 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Tue, 11 Jun 2013 11:33:05 +0200
Subject: NEVERHOOD: Try to fix the Smacker issues inside of SmackerPlayer only
 (instead the numerous classes using it)

SmackerPlayer now creates a surface in the constructor and deletes it in the destructor. There will be only this surface during the lifetime of the player, so there shouldn't be any issues any more when the player is reused for different Smacker files. This is imo nicer than to remove/add the surface.
I kept the several openSmacker since it wraps some code which is nice.
---
 engines/neverhood/smackerplayer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/neverhood/smackerplayer.h')

diff --git a/engines/neverhood/smackerplayer.h b/engines/neverhood/smackerplayer.h
index 26ebff5d33..f13b653757 100644
--- a/engines/neverhood/smackerplayer.h
+++ b/engines/neverhood/smackerplayer.h
@@ -37,6 +37,7 @@ public:
 	SmackerSurface(NeverhoodEngine *vm);
 	virtual void draw();
 	void setSmackerFrame(const Graphics::Surface *smackerFrame);
+	void unsetSmackerFrame();
 protected:
 	const Graphics::Surface *_smackerFrame;
 };
-- 
cgit v1.2.3


From 989ea7cb56245ce1918ddf54c2e06973ebcd6239 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 14 Jul 2013 19:01:47 +0200
Subject: JANITORIAL: Remove trailing whitespace

---
 engines/neverhood/smackerplayer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/neverhood/smackerplayer.h')

diff --git a/engines/neverhood/smackerplayer.h b/engines/neverhood/smackerplayer.h
index f13b653757..dd7199dd6d 100644
--- a/engines/neverhood/smackerplayer.h
+++ b/engines/neverhood/smackerplayer.h
@@ -62,7 +62,7 @@ public:
 	void close();
 	void gotoFrame(int frameNumber);
 	uint32 getFrameCount();
-	uint32 getFrameNumber(); 
+	uint32 getFrameNumber();
 	uint getStatus();
 	void setDrawPos(int16 x, int16 y);
 	void rewind();
-- 
cgit v1.2.3