aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
authorTobia Tesan2014-02-18 22:23:42 +0100
committerTobia Tesan2014-10-15 21:36:46 +0200
commitdd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3 (patch)
tree01836f42da8c5a8aeca7840a1dd78f7d66a2c4c4 /engines/wintermute
parent7b4084b7e0273b37f1fb0583431540d977c424ae (diff)
downloadscummvm-rg350-dd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3.tar.gz
scummvm-rg350-dd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3.tar.bz2
scummvm-rg350-dd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3.zip
WINTERMUTE: Turn a bunch of uint into uint32 in VideoSubtitle
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/video/video_subtitle.cpp4
-rw-r--r--engines/wintermute/video/video_subtitle.h8
-rw-r--r--engines/wintermute/video/video_subtitler.cpp2
-rw-r--r--engines/wintermute/video/video_subtitler.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index eb95f25944..b02a3ec50f 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -44,11 +44,11 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const
_endFrame = endFrame;
}
-uint VideoSubtitle::getStartFrame() {
+uint32 VideoSubtitle::getStartFrame() {
return _startFrame;
}
-uint VideoSubtitle::getEndFrame() {
+uint32 VideoSubtitle::getEndFrame() {
return _endFrame;
}
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 4c80c0cdfd..fb80a58a72 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -37,12 +37,12 @@ class VideoSubtitle : public BaseClass {
public:
VideoSubtitle(BaseGame *inGame);
VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
- uint getEndFrame();
- uint getStartFrame();
+ uint32 getEndFrame();
+ uint32 getStartFrame();
Common::String getText();
private:
- uint _endFrame;
- uint _startFrame;
+ uint32 _endFrame;
+ uint32 _startFrame;
Common::String _text;
};
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 05c7b6c563..c8acbeb98b 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -201,7 +201,7 @@ void VideoSubtitler::display() {
}
}
-void VideoSubtitler::update(uint frame) {
+void VideoSubtitler::update(uint32 frame) {
if (_subtitles.size() == 0) {
// Edge case: we have loaded subtitles early on... from a blank file.
return;
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 3f62c05134..655b1a5969 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -41,10 +41,10 @@ public:
virtual ~VideoSubtitler(void);
bool _showSubtitle;
- uint _currentSubtitle;
+ uint32 _currentSubtitle;
bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
void display();
- void update(uint frame);
+ void update(uint32 frame);
private:
Common::Array<VideoSubtitle *> _subtitles;
uint32 _lastSample;