[Scummvm-cvs-logs] scummvm master -> 9f1fd0dbff6e1702f49708c8ef4cc91f3b44ca4e

bluegr bluegr at gmail.com
Tue Dec 23 10:05:12 CET 2014


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:
9f1fd0dbff ZVISION: Disable unused code


Commit: 9f1fd0dbff6e1702f49708c8ef4cc91f3b44ca4e
    https://github.com/scummvm/scummvm/commit/9f1fd0dbff6e1702f49708c8ef4cc91f3b44ca4e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-23T11:03:57+02:00

Commit Message:
ZVISION: Disable unused code

Changed paths:
    engines/zvision/text/text.cpp
    engines/zvision/text/text.h



diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index d1dc784..53fcafd 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -44,10 +44,12 @@ cTxtStyle::cTxtStyle() {
 	_green = 255;
 	_red = 255;
 	_bold = false;
+#if 0
+	_newline = false;
 	_escapement = 0;
+#endif
 	_italic = false;
 	_justify = TXT_JUSTIFY_LEFT;
-	_newline = false;
 	_size = 12;
 	_skipcolor = false;
 	_strikeout = false;
@@ -115,10 +117,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				}
 			}
 		} else if (token.matchString("newline", true)) {
+#if 0
 			if ((retval & TXT_RET_NEWLN) == 0)
 				_newline = 0;
 
 			_newline++;
+#endif
 			retval |= TXT_RET_NEWLN;
 		} else if (token.matchString("point", true)) {
 			if (!tokenizer.empty()) {
@@ -132,8 +136,10 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 		} else if (token.matchString("escapement", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
+#if 0
 				int32 tmp = atoi(token.c_str());
 				_escapement = tmp;
+#endif
 			}
 		} else if (token.matchString("italic", true)) {
 			if (!tokenizer.empty()) {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c278b01..c044e91 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -61,8 +61,10 @@ public:
 	uint8 _red;     // 0-255
 	uint8 _green;   // 0-255
 	uint8 _blue;    // 0-255
+#if  0
 	int8 _newline;
 	int8 _escapement;
+#endif
 	bool _italic;
 	bool _bold;
 	bool _underline;






More information about the Scummvm-git-logs mailing list