[Scummvm-git-logs] scummvm master -> 7e09737067fedd5eeb2b2ef7d26575e3d1445ea1

[dreammaster]

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:
7e09737067 GLK: FROTZ: Change fonts version check to not use atof


Commit: 7e09737067fedd5eeb2b2ef7d26575e3d1445ea1
    https://github.com/scummvm/scummvm/commit/7e09737067fedd5eeb2b2ef7d26575e3d1445ea1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-20T07:47:33-08:00

Commit Message:
GLK: FROTZ: Change fonts version check to not use atof

Changed paths:
    engines/glk/screen.cpp


diff --git a/engines/glk/screen.cpp b/engines/glk/screen.cpp
index df2a288..f493329 100644
--- a/engines/glk/screen.cpp
+++ b/engines/glk/screen.cpp
@@ -81,14 +81,19 @@ void Screen::loadFonts() {
 	}
 
 	// Validate the version
-	char buffer[4];
-	f.read(buffer, 3);
-	buffer[3] = '\0';
+	char buffer[5];
+	f.read(buffer, 4);
+	buffer[4] = '\0';
+
+	int major = 0, minor = 0;
+	if (buffer[1] == '.') {
+		major = buffer[0] - '0';
+		minor = atoi(&buffer[2]);
+	}
 
-	double version = atof(buffer);
-	if (version < 1.2) {
+	if (major < 1 || minor < 2) {
 		delete archive;
-		error("Out of date fonts. Expected at least %f, but got version %f", 1.2, version);
+		error("Out of date fonts. Expected at least %s, but got version %d.%d", "1.2", major, minor);
 	}
 
 	loadFonts(archive);