[Scummvm-cvs-logs] CVS: residual textobject.cpp,1.7,1.8

Jonathan Gray khalek at users.sourceforge.net
Fri Jun 4 07:09:12 CEST 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19714

Modified Files:
	textobject.cpp 
Log Message:
fix segfault that occurred when  pressing ^n

Index: textobject.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- textobject.cpp	28 Mar 2004 11:00:16 -0000	1.7
+++ textobject.cpp	4 Jun 2004 14:08:41 -0000	1.8
@@ -33,7 +33,12 @@
 
 void TextObject::draw() {
 	const char *localString = Localizer::instance()->localize(textID_).c_str();
-
-	g_driver->drawEmergString(x_, y_, strrchr(localString, '/') + 1, fgColor_);
+	// This is also used for things like debugging in addition
+	// to dialogue so there aren't always translations
+	if (strrchr(localString, '/') != NULL) {
+		g_driver->drawEmergString(x_, y_, strrchr(localString, '/') + 1, fgColor_);
+	} else {
+		g_driver->drawEmergString(x_, y_, localString, fgColor_);
+	}
 }
 





More information about the Scummvm-git-logs mailing list