NEVERHOOD: Rename stuff in the Scene class and clean up a little

- Try to stay close to the actual frame rate
- Also use the Smacker frame rate when a video is playing to
  keep videos in sync with the audio

1 files changed, 5 insertions, 2 deletions

diff --git a/engines/neverhood/screen.h b/engines/neverhood/screen.h
index fe5a2546c0..56a256757c 100644
--- a/engines/neverhood/screen.h
+++ b/engines/neverhood/screen.h
@@ -24,6 +24,7 @@
 #define NEVERHOOD_SCREEN_H
 
 #include "graphics/surface.h"
+#include "video/smk_decoder.h"
 #include "neverhood/neverhood.h"
 #include "neverhood/graphics.h"
 
@@ -51,11 +52,13 @@ public:
 	void drawDoubleSurface2(const Graphics::Surface *surface, NDrawRect &drawRect);
 	void drawUnk(const Graphics::Surface *surface, NDrawRect &drawRect, NDrawRect &sysRect, NRect &clipRect, bool transparent);
 	void drawSurfaceClipRects(const Graphics::Surface *surface, NDrawRect &drawRect, NRect *clipRects, uint clipRectsCount, bool transparent);
+	void setSmackerDecoder(Video::SmackerDecoder *smackerDecoder) { _smackerDecoder = smackerDecoder; }
 protected:
 	NeverhoodEngine *_vm;
 	Graphics::Surface *_backScreen;
-	uint32 _ticks;
-	uint32 _frameDelay;
+	Video::SmackerDecoder *_smackerDecoder;
+	int32 _ticks;
+	int32 _frameDelay;
 	byte *_paletteData;
 	bool _paletteChanged;
 };