aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/video
diff options
context:
space:
mode:
authorTobia Tesan2014-02-07 12:14:23 +0100
committerTobia Tesan2014-10-15 21:36:45 +0200
commit8decf3d7424c8cb8eeae99d0aede78c445f18e9f (patch)
tree86d6132ed2eb4dd5466b148c2b6d24089c95120a /engines/wintermute/video
parent2eee488e364460772dcb8a85962f6c210810587b (diff)
downloadscummvm-rg350-8decf3d7424c8cb8eeae99d0aede78c445f18e9f.tar.gz
scummvm-rg350-8decf3d7424c8cb8eeae99d0aede78c445f18e9f.tar.bz2
scummvm-rg350-8decf3d7424c8cb8eeae99d0aede78c445f18e9f.zip
WINTERMUTE: Remove ////-style separators from imported subtitle code
Diffstat (limited to 'engines/wintermute/video')
-rw-r--r--engines/wintermute/video/video_subtitle.cpp5
-rw-r--r--engines/wintermute/video/video_subtitle.h3
-rw-r--r--engines/wintermute/video/video_subtitler.cpp10
-rw-r--r--engines/wintermute/video/video_subtitler.h3
4 files changed, 9 insertions, 12 deletions
diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index bcaa293124..21fb5ec105 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -30,12 +30,10 @@
#include "engines/wintermute/base/base_game.h"
namespace Wintermute {
-//////////////////////////////////////////////////////////////////////////
VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
_startFrame = _endFrame = 0;
}
-//////////////////////////////////////////////////////////////////////////
VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
_gameRef->expandStringByStringTable(&text);
_text = Common::String(text);
@@ -54,4 +52,5 @@ long VideoSubtitle::getEndFrame() {
Common::String VideoSubtitle::getText() {
return _text;
}
-}
+
+} // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 5df1348465..3af0d06fa5 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -45,6 +45,7 @@ private:
long _startFrame;
Common::String _text;
};
-}
+
+} // End of namespace Wintermute
#endif
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index a1294dd3d4..b85e179b7c 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -34,14 +34,13 @@
#include "engines/wintermute/base/gfx/base_renderer.h"
namespace Wintermute {
-//////////////////////////////////////////////////////////////////////////
+
VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
_lastSample = -1;
_currentSubtitle = 0;
_showSubtitle = false;
}
-//////////////////////////////////////////////////////////////////////////
VideoSubtitler::~VideoSubtitler(void) {
for (uint i = 0; i < _subtitles.size(); i++) {
delete _subtitles[i];
@@ -50,8 +49,6 @@ VideoSubtitler::~VideoSubtitler(void) {
_subtitles.clear();
}
-
-//////////////////////////////////////////////////////////////////////////
bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFile) {
if (!filename) {
return false;
@@ -182,7 +179,6 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
return true;
}
-//////////////////////////////////////////////////////////////////////////
bool VideoSubtitler::display() {
if (_showSubtitle) {
BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
@@ -195,7 +191,6 @@ bool VideoSubtitler::display() {
return false;
}
-//////////////////////////////////////////////////////////////////////////
bool VideoSubtitler::update(long frame) {
if (frame != _lastSample) {
/*
@@ -252,4 +247,5 @@ bool VideoSubtitler::update(long frame) {
}
return false;
}
-}
+
+} // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 68964a4084..977fc10066 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -48,6 +48,7 @@ public:
long _lastSample;
Common::Array<VideoSubtitle *> _subtitles;
};
-}
+
+} // End of namespace Wintermute
#endif