[Scummvm-git-logs] scummvm master -> 574318c052752a789461fe463d904a889e59ef8c

digitall dgturner at iee.org
Tue Jul 31 14:31:13 CEST 2018


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:
574318c052 MOHAWK: Fix Unused Variable Compiler Warning.


Commit: 574318c052752a789461fe463d904a889e59ef8c
    https://github.com/scummvm/scummvm/commit/574318c052752a789461fe463d904a889e59ef8c
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-31T13:38:33+01:00

Commit Message:
MOHAWK: Fix Unused Variable Compiler Warning.

This occurs when FreeType2 is not enabled and thus fontHeight variable
is unused.

Changed paths:
    engines/mohawk/riven_stacks/aspit.cpp


diff --git a/engines/mohawk/riven_stacks/aspit.cpp b/engines/mohawk/riven_stacks/aspit.cpp
index 59cc3b9..6f22786 100644
--- a/engines/mohawk/riven_stacks/aspit.cpp
+++ b/engines/mohawk/riven_stacks/aspit.cpp
@@ -98,17 +98,21 @@ void ASpit::xastartupbtnhide(const ArgumentArray &args) {
 	const char *fontname;
 	const Graphics::Font *font = nullptr;
 
-	int fontHeight;
 	if (_vm->getLanguage() != Common::JA_JPN) {
 		fontname = "FreeSans.ttf";
-		fontHeight = 12;
 	} else {
 		fontname = "mplus-2c-regular.ttf";
-		fontHeight = 11;
 	}
 
-
 #if defined(USE_FREETYPE2)
+	int fontHeight;
+
+	if (_vm->getLanguage() != Common::JA_JPN) {
+		fontHeight = 12;
+	} else {
+		fontHeight = 11;
+	}
+
 	if (file.open(fontname)) {
 		font = Graphics::loadTTFFont(file, fontHeight);
 	}





More information about the Scummvm-git-logs mailing list