From 0a43bba003c5e5cbf302a667e8515d4066d72407 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 9 Jul 2012 04:50:38 +0200
Subject: WINTERMUTE: Rename FuncName->funcName in coll_templ.h

---
 engines/wintermute/video/VidPlayer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/wintermute/video')

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