[Scummvm-cvs-logs] CVS: scummvm/gui ThemeNew.cpp,1.12,1.13

Chris Apers chrilith at users.sourceforge.net
Mon Jan 30 11:04:03 CET 2006


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

Modified Files:
	ThemeNew.cpp 
Log Message:
Replace use of sscanf

Index: ThemeNew.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ThemeNew.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ThemeNew.cpp	29 Jan 2006 16:12:58 -0000	1.12
+++ ThemeNew.cpp	30 Jan 2006 19:02:33 -0000	1.13
@@ -36,9 +36,15 @@
 static void getColorFromConfig(const Common::ConfigFile &cfg, const Common::String &value, OverlayColor &color) {
 	Common::String temp;
 	cfg.getKey(value, "colors", temp);
-	int r, g, b;
-	sscanf(temp.c_str(), "%d %d %d", &r, &g, &b);
-	color = OSystem::instance().RGBToColor(r, g, b);
+
+	int rgb[3], pos = 0;
+	const char *colors = temp.c_str();
+
+	for (int cnt = 0; cnt < 3; cnt++) {
+		rgb[cnt] = atoi(colors + pos);
+		pos = strchr(colors + pos, ' ') - colors + 1;
+	}
+	color = OSystem::instance().RGBToColor(rgb[0], rgb[1], rgb[2]);
 }
 
 namespace GUI {





More information about the Scummvm-git-logs mailing list