[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.98,1.99

Jonathan Gray khalek at users.sourceforge.net
Tue Apr 8 15:16:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5696

Modified Files:
	string.cpp 
Log Message:
text in zak is now using the incorrect font and it does nasty stuff like overlapping text as well, but this makes zak work again to set values of work, someone please fix this before 0.4.0

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- string.cpp	8 Apr 2003 19:05:41 -0000	1.98
+++ string.cpp	8 Apr 2003 22:15:46 -0000	1.99
@@ -144,7 +144,7 @@
 	_charset->_right = _string[0].right;
 	_charset->_color = _charsetColor;
 
-	if (!(_features & GF_AFTER_V3))	// FIXME
+	if (!(_features & GF_OLD256))	// FIXME
 		for (i = 0; i < 4; i++)
 			_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];
 
@@ -187,7 +187,7 @@
 	_talkDelay = _defaultTalkDelay;
 
 	if (!_keepText) {
-		if (_features & GF_AFTER_V3) {
+		if (_features & GF_OLD256) {
 			gdi._mask_left = _string[0].xpos;
 			gdi._mask_top = _string[0].ypos;
 			gdi._mask_bottom = _string[0].ypos + 8;
@@ -227,7 +227,7 @@
 		}
 		if (c == 13) {
 		newLine:;
-			if (_features & GF_AFTER_V3) {
+			if (_features & GF_OLD256) {
 				_charset->_nextTop = 8;
 				_charset->_nextLeft = 0;
 				continue;
@@ -248,7 +248,7 @@
 		if (c != 0xFF) {
 			_charset->_left = _charset->_nextLeft;
 			_charset->_top = _charset->_nextTop;
-			if (_features & GF_AFTER_V3) {
+			if (_features & GF_OLD256) {
 				_charset->printChar(c);
 			} else if (_features & GF_AFTER_V6) {
 				if (!_noSubtitles || (_haveMsg != 0xFE && _haveMsg != 0xFF))
@@ -410,7 +410,7 @@
 	_charset->_disableOffsX = _charset->_firstChar = true;
 	_charset->setCurID(_string[a].charset);
 
-	if (!(_features & GF_AFTER_V3)) {
+	if (!(_features & GF_OLD256)) {
 		for (i = 0; i < 4; i++)
 			_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];
 
@@ -748,6 +748,11 @@
 
 void Scumm::initCharset(int charsetno) {
 	int i;
+
+	if (_gameId == GID_ZAK256) {
+		debug(0, "initCharset: FIXME using incorrect charset");
+		charsetno = !charsetno;
+	}
 
 	if (_features & GF_SMALL_HEADER)
 		loadCharset(charsetno);





More information about the Scummvm-git-logs mailing list