[Scummvm-git-logs] scummvm master -> 255c76b3acce13a17a11a0022e10706e9c0045d3

sev- sev at scummvm.org
Thu Feb 2 09:18:35 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
255c76b3ac GRAPHICS: Optimize for empty substrings in MacText


Commit: 255c76b3acce13a17a11a0022e10706e9c0045d3
    https://github.com/scummvm/scummvm/commit/255c76b3acce13a17a11a0022e10706e9c0045d3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-02T09:18:08+01:00

Commit Message:
GRAPHICS: Optimize for empty substrings in MacText

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 84db1c2..0201b19 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -162,7 +162,7 @@ void MacText::splitString(Common::String &str) {
 					curChunk = 0;
 				}
 			} else {
-				if (nextChunk && 0) { // No text, replacing formatting
+				if (nextChunk) { // No text, replacing formatting
 					_textLines[curLine].chunks[curChunk] = _currentFormatting;
 				}
 			}
@@ -248,6 +248,9 @@ void MacText::render(int from, int to) {
 
 		// TODO: _textMaxWidth, when -1, was not rendering ANY text.
 		for (uint j = 0; j < _textLines[i].chunks.size(); j++) {
+			if (_textLines[i].chunks[j].text.empty())
+				continue;
+
 			_textLines[i].chunks[j].getFont()->drawString(_surface, _textLines[i].chunks[j].text, xOffset, _textLines[i].y, _maxWidth, _fgcolor);
 			xOffset += _textLines[i].chunks[j].getFont()->getStringWidth(_textLines[i].chunks[j].text);
 		}





More information about the Scummvm-git-logs mailing list