[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.45,1.46

[Max Horn]

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

Modified Files:
	string.cpp 
Log Message:
partial fix for bug #613109

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- string.cpp	19 Nov 2002 16:33:33 -0000	1.45
+++ string.cpp	20 Nov 2002 13:20:39 -0000	1.46
@@ -171,14 +171,9 @@
 	if (_string[3].color == 0)
 		_string[3].color = 4;
 
-//	if (_gameId == GID_MONKEY_VGA) {FIXME why was this game check added?
-
-		InfoDialog* dialog = new InfoDialog(_newgui, this, (char*)buf);
-		runDialog (dialog);
-		delete dialog;
-//	} else {
-//		printf("unkMessage2: %s\n", buf);
-//	}
+	InfoDialog* dialog = new InfoDialog(_newgui, this, (char*)buf);
+	runDialog (dialog);
+	delete dialog;
 
 	_messagePtr = tmp;
 }
@@ -891,7 +886,7 @@
 }
 
 void CharsetRenderer::printCharOld(int chr)
-{																// Loom3 / Zak256
+{																// Indy3 / Zak256
 	VirtScreen *vs;
 	byte *char_ptr, *dest_ptr;
 	unsigned int buffer = 0, mask = 0, x = 0, y = 0;
@@ -1130,6 +1125,10 @@
 			}
 		}
 	}
+	
+	// FIXME - this fixes the inventory icons in Zak256, see bug #613109
+	if (_vm->_gameId == GID_ZAK256 && (chr==3 || chr==4))
+		spacing = 6;
 	
 	return spacing;
 }