diff options
| author | Tobia Tesan | 2014-09-09 15:30:47 +0200 |
|---|---|---|
| committer | Tobia Tesan | 2014-10-15 21:36:47 +0200 |
| commit | c6930d9a64d6d61ece2f0b531ad93459d2730150 (patch) | |
| tree | 8deb4e6154255ca14d89fd9daa6729423e4ee428 | |
| parent | ebb48a1704b236d986539dbc716aae2d73921bb7 (diff) | |
| download | scummvm-rg350-c6930d9a64d6d61ece2f0b531ad93459d2730150.tar.gz scummvm-rg350-c6930d9a64d6d61ece2f0b531ad93459d2730150.tar.bz2 scummvm-rg350-c6930d9a64d6d61ece2f0b531ad93459d2730150.zip | |
WINTERMUTE: Use int32 for _lastSample in VideoSubtitler
We are thus making room for the sentinel == -1
| -rw-r--r-- | engines/wintermute/video/video_subtitler.cpp | 2 | ||||
| -rw-r--r-- | 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<SubtitleCard *> _subtitles; - uint32 _lastSample; + int32 _lastSample; }; } // End of namespace Wintermute |