From c6930d9a64d6d61ece2f0b531ad93459d2730150 Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Tue, 9 Sep 2014 15:30:47 +0200 Subject: WINTERMUTE: Use int32 for _lastSample in VideoSubtitler We are thus making room for the sentinel == -1 --- engines/wintermute/video/video_subtitler.cpp | 2 +- engines/wintermute/video/video_subtitler.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp index c57a70ec3b..2117832fad 100644 --- a/engines/wintermute/video/video_subtitler.cpp +++ b/engines/wintermute/video/video_subtitler.cpp @@ -207,7 +207,7 @@ void VideoSubtitler::update(uint32 frame) { return; } - if (frame != _lastSample) { + if ((int32)frame != _lastSample) { /* * If the frame count hasn't advanced the previous state still matches * the current frame (obviously). diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h index 32e4368daf..f2dcdf161e 100644 --- a/engines/wintermute/video/video_subtitler.h +++ b/engines/wintermute/video/video_subtitler.h @@ -47,7 +47,7 @@ public: void update(uint32 frame); private: Common::Array _subtitles; - uint32 _lastSample; + int32 _lastSample; }; } // End of namespace Wintermute -- cgit v1.2.3