diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 04:50:38 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 04:50:38 +0200 |
| commit | 0a43bba003c5e5cbf302a667e8515d4066d72407 (patch) | |
| tree | f47246629e29786bbc4239c286b19153dbb37e5d /engines/wintermute/video | |
| parent | 0ef77c57b6f6889471c7c5d902999fcf34c47a89 (diff) | |
| download | scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.tar.gz scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.tar.bz2 scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.zip | |
WINTERMUTE: Rename FuncName->funcName in coll_templ.h
Diffstat (limited to 'engines/wintermute/video')
| -rw-r--r-- | engines/wintermute/video/VidPlayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp index 7fa8e6e218..eed2ddce86 100644 --- a/engines/wintermute/video/VidPlayer.cpp +++ b/engines/wintermute/video/VidPlayer.cpp @@ -114,8 +114,8 @@ ERRORCODE CVidPlayer::cleanup() { SAFE_DELETE_ARRAY(_filename); - for (int i = 0; i < _subtitles.GetSize(); i++) delete _subtitles[i]; - _subtitles.RemoveAll(); + for (int i = 0; i < _subtitles.getSize(); i++) delete _subtitles[i]; + _subtitles.removeAll(); return SetDefaults(); #endif @@ -242,10 +242,10 @@ ERRORCODE CVidPlayer::update() { // process subtitles _showSubtitle = false; - while (_currentSubtitle < _subtitles.GetSize()) { + while (_currentSubtitle < _subtitles.getSize()) { int End = _subtitles[_currentSubtitle]->m_EndFrame; - bool NextFrameOK = (_currentSubtitle < _subtitles.GetSize() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= sample); + bool NextFrameOK = (_currentSubtitle < _subtitles.getSize() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= sample); if (sample > End) { if (NextFrameOK) { @@ -455,7 +455,7 @@ ERRORCODE CVidPlayer::loadSubtitles(const char *filename, const char *SubtitleFi } Text[TextLength] = '\0'; - if (Start != -1 && TextLength > 0) _subtitles.Add(new CVidSubtitle(Game, Text, Start, End)); + if (Start != -1 && TextLength > 0) _subtitles.add(new CVidSubtitle(Game, Text, Start, End)); delete [] Text; |