ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

WINTERMUTE: Remove ////-style separators from imported subtitle code

Browse Source
This commit is contained in:
Tobia Tesan
2014-10-15 21:36:45 +02:00
parent 2eee488e36
commit 8decf3d742
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/wintermute/video/video_subtitle.cpp
+2 -3
View File
@@ -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
engines/wintermute/video/video_subtitle.h
+2 -1
View File
@@ -45,6 +45,7 @@ private:
long _startFrame;
Common::String _text;
};
}
} // End of namespace Wintermute
#endif
engines/wintermute/video/video_subtitler.cpp
+3 -7
View File
@@ -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
engines/wintermute/video/video_subtitler.h
+2 -1
View File
@@ -48,6 +48,7 @@ public:
long _lastSample;
Common::Array<VideoSubtitle *> _subtitles;
};
}
} // End of namespace Wintermute
#endif