ZVISION: Rename struct member to fix compilation with MSVC

A struct member can't have the same name as the struct itself
scummvm · Dec 2, 2014 · 7976a34 · 7976a34
1 parent daeb1ea
commit 7976a34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -43,7 +43,7 @@ class Subtitle {
 	struct sub {
 		int start;
 		int stop;
-		Common::String sub;
+		Common::String subStr;
 	};
 
 	Common::Array<sub> _subs;