[Scummvm-cvs-logs] scummvm master -> 003269dc36288a99d15c65f44d2181ad08dc6181

[bluegr]

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:
003269dc36 ZVISION: Fix the display of state variables, such as the high score


Commit: 003269dc36288a99d15c65f44d2181ad08dc6181
    https://github.com/scummvm/scummvm/commit/003269dc36288a99d15c65f44d2181ad08dc6181
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-16T11:08:40+02:00

Commit Message:
ZVISION: Fix the display of state variables, such as the high score

Common::String::format() was used incorrectly. Also, state variables
were handled incorrectly in the TTY text parser

Changed paths:
    engines/zvision/scripting/sidefx/ttytext_node.cpp
    engines/zvision/text/text.cpp



diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
index 1fb7c10..9a7fa01 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -96,7 +96,7 @@ bool ttyTextNode::process(uint32 deltaTimeInMillis) {
 
 				if (ret & TXT_RET_HASSTBOX) {
 					Common::String buf;
-					buf.format("%d", _style.statebox);
+					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style.statebox));
 
 					for (uint8 j = 0; j < buf.size(); j++)
 						outchar(buf[j]);
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 0ccca21..406c36e 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -396,7 +396,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 
 			if (ret & TXT_RET_HASSTBOX) {
 				Common::String buf3;
-				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
+				buf3 = Common::String::format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
 				buf += buf3;
 				textPosition += buf3.size();
 			}