[Scummvm-cvs-logs] scummvm master -> d86bec542c37bef630ab05fb03345cb02d546e7f

[m-kiewitz]

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:
d86bec542c SHERLOCK: font class: skip for 3DO


Commit: d86bec542c37bef630ab05fb03345cb02d546e7f
    https://github.com/scummvm/scummvm/commit/d86bec542c37bef630ab05fb03345cb02d546e7f
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-11T12:32:26+02:00

Commit Message:
SHERLOCK: font class: skip for 3DO

Changed paths:
    engines/sherlock/fonts.cpp
    engines/sherlock/fonts.h
    engines/sherlock/screen.cpp



diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index e7173f0..8c3abb7 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -21,18 +21,21 @@
  */
 
 #include "common/system.h"
+#include "common/platform.h"
 #include "sherlock/fonts.h"
 #include "sherlock/image_file.h"
 #include "sherlock/surface.h"
 
 namespace Sherlock {
 
+Common::Platform Fonts::_platform;
 ImageFile *Fonts::_font;
 int Fonts::_fontNumber;
 int Fonts::_fontHeight;
 
-void Fonts::init() {
+void Fonts::init(Common::Platform platform) {
 	_font = nullptr;
+	_platform = platform;
 }
 
 void Fonts::free() {
@@ -41,6 +44,10 @@ void Fonts::free() {
 
 void Fonts::setFont(int fontNumber) {
 	_fontNumber = fontNumber;
+
+	if (_platform == Common::kPlatform3DO)
+		return;
+
 	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber + 1);
 
 	// Discard any previous font and read in new one
diff --git a/engines/sherlock/fonts.h b/engines/sherlock/fonts.h
index 0c8c51c..1013807 100644
--- a/engines/sherlock/fonts.h
+++ b/engines/sherlock/fonts.h
@@ -34,6 +34,7 @@ class Surface;
 
 class Fonts {
 private:
+	static Common::Platform _platform;
 	static ImageFile *_font;
 protected:
 	static int _fontNumber;
@@ -45,7 +46,7 @@ public:
 	/**
 	 * Initialise the font manager
 	 */
-	static void init();
+	static void init(Common::Platform platform);
 
 	/**
 	 * Frees the font manager
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index d16296f..6463bac 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -39,7 +39,8 @@ Screen::Screen(SherlockEngine *vm) : Surface(g_system->getWidth(), g_system->get
 	Common::fill(&_tMap[0], &_tMap[PALETTE_SIZE], 0);
 	
 	// Set up the initial font
-	Fonts::init();
+	Fonts::init(_vm->getPlatform());
+
 	setFont(IS_SERRATED_SCALPEL ? 1 : 4);
 
 	// Rose Tattoo specific fields