From 8decf3d7424c8cb8eeae99d0aede78c445f18e9f Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Fri, 7 Feb 2014 12:14:23 +0100
Subject: WINTERMUTE: Remove ////-style separators from imported subtitle code

---
 engines/wintermute/video/video_subtitle.cpp  |  5 ++---
 engines/wintermute/video/video_subtitle.h    |  3 ++-
 engines/wintermute/video/video_subtitler.cpp | 10 +++-------
 engines/wintermute/video/video_subtitler.h   |  3 ++-
 4 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'engines/wintermute')

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
-- 
cgit v1.2.3