aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/zvision/subtitles/subtitles.cpp6
-rw-r--r--engines/zvision/subtitles/subtitles.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
index 1f68b2435f..d36eb24923 100644
--- a/engines/zvision/subtitles/subtitles.cpp
+++ b/engines/zvision/subtitles/subtitles.cpp
@@ -55,7 +55,7 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
sub curSubtitle;
curSubtitle.start = -1;
curSubtitle.stop = -1;
- curSubtitle.sub = txtline;
+ curSubtitle.subStr = txtline;
_subs.push_back(curSubtitle);
}
@@ -98,9 +98,9 @@ void Subtitle::process(int32 time) {
}
if (j != -1 && j != _subId) {
- if (_subs[j].sub.size())
+ if (_subs[j].subStr.size())
if (_areaId != -1)
- _engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
+ _engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
_subId = j;
}
}
diff --git a/engines/zvision/subtitles/subtitles.h b/engines/zvision/subtitles/subtitles.h
index 09e079bba4..c3da6583a4 100644
--- a/engines/zvision/subtitles/subtitles.h
+++ b/engines/zvision/subtitles/subtitles.h
@@ -43,7 +43,7 @@ private:
struct sub {
int start;
int stop;
- Common::String sub;
+ Common::String subStr;
};
Common::Array<sub> _subs;