aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/text
diff options
context:
space:
mode:
authorEugene Sandulenko2016-09-03 12:46:38 +0200
committerEugene Sandulenko2016-09-03 12:46:38 +0200
commitfab199d37eab7345a8dff6bd44cbf261e32a878c (patch)
tree928c92780cc2f10402e6b3f0e90d73f2c1a4dd27 /engines/zvision/text
parent87eef75a26bde46f3abafef08b6ad75a4dd12060 (diff)
downloadscummvm-rg350-fab199d37eab7345a8dff6bd44cbf261e32a878c.tar.gz
scummvm-rg350-fab199d37eab7345a8dff6bd44cbf261e32a878c.tar.bz2
scummvm-rg350-fab199d37eab7345a8dff6bd44cbf261e32a878c.zip
JANITORIAL: Make GPL headers uniform
Diffstat (limited to 'engines/zvision/text')
-rw-r--r--engines/zvision/text/subtitles.cpp4
-rw-r--r--engines/zvision/text/text.cpp16
-rw-r--r--engines/zvision/text/text.h4
-rw-r--r--engines/zvision/text/truetype_font.cpp6
4 files changed, 15 insertions, 15 deletions
diff --git a/engines/zvision/text/subtitles.cpp b/engines/zvision/text/subtitles.cpp
index ffc9e2b808..d4a31c04ce 100644
--- a/engines/zvision/text/subtitles.cpp
+++ b/engines/zvision/text/subtitles.cpp
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 868ee4f1ae..38ae6c57a7 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -341,14 +341,14 @@ void TextRenderer::drawTextWithWordWrapping(const Common::String &text, Graphics
while (i < stringlen) {
if (text[i] == '<') {
- // Flush the currentWord to the currentSentence
+ // Flush the currentWord to the currentSentence
currentSentence += currentWord;
sentenceWidth += wordWidth;
// Reset the word variables
currentWord.clear();
wordWidth = 0;
-
+
// Parse the style tag
uint startTextPosition = i;
while (i < stringlen && text[i] != '>') {
@@ -388,13 +388,13 @@ void TextRenderer::drawTextWithWordWrapping(const Common::String &text, Graphics
if (!currentSentence.empty()) {
textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, textColor), sentencePixelOffset, currentLineNumber));
}
-
+
// Set line width
lineWidths.push_back(lineWidth + sentenceWidth - (numSpaces * spaceWidth));
currentSentence.clear();
sentenceWidth = 0;
-
+
// Update the offsets
sentencePixelOffset.x = 0u;
sentencePixelOffset.y += lineHeight;
@@ -446,7 +446,7 @@ void TextRenderer::drawTextWithWordWrapping(const Common::String &text, Graphics
// We track the number of spaces so we can disregard their width in lineWidth calculations
++numSpaces;
- } else {
+ } else {
// If the word causes the line to overflow, render the sentence and start a new line
if (lineWidth + sentenceWidth + wordWidth > dest.w) {
// Only render out content
@@ -482,7 +482,7 @@ void TextRenderer::drawTextWithWordWrapping(const Common::String &text, Graphics
if (!currentWord.empty() || !currentSentence.empty()) {
currentSentence += currentWord;
sentenceWidth += wordWidth;
-
+
textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, currentState.getTextColor(_engine)), sentencePixelOffset, currentLineNumber));
}
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index 5dd872a440..c003bb3c42 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index ccb86d9440..7848de5434 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -66,7 +66,7 @@ StyledTTFont::~StyledTTFont() {
bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
// Don't re-load the font if we've already loaded it
- // We have to check for empty so we can default to Arial
+ // We have to check for empty so we can default to Arial
if (!fontName.empty() && _fontName.equalsIgnoreCase(fontName) && _lineHeight == point && _style == style) {
return true;
}