cpp/openttd-patchpack/source Changeset - r19666:c5b928c1a182

Changeset - r19666:c5b928c1a182

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 12 years ago 2012-10-16 20:21:14
rubidium@openttd.org

(svn r24597) -Fix [FS#5336]: when fontconfig is not available, the bootstrap download crashed

1 file changed with 1 insertions and 1 deletions:

src/bootstrap_gui.cpp

0 comments (0 inline, 0 general)

src/bootstrap_gui.cpp

➞

Show inline comments

@@ @@ -209,25 +209,25 @@ public: @@
  * This requires all kinds of trickery that is needed to avoid the use of
  * sprites from the base graphics set which are pretty interwoven.
  * @return True if a base set exists, otherwise false.
  */
 bool HandleBootstrap()
+{
 	if (BaseGraphics::GetUsedSet() != NULL) return true;
 	/* No user interface, bail out with an error. */
 	if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 0) goto failure;
 	/* If there is no network or no freetype, then there is nothing we can do. Go straight to failure. */
 #if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) && !defined(__APPLE__)
+#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) && !defined(__APPLE__) && (defined(WITH_FONTCONFIG) || defined(WIN32))
 	if (!_network_available) goto failure;
 	/* First tell the game we're bootstrapping. */
 	_game_mode = GM_BOOTSTRAP;
 	/* Initialise the freetype font code. */
 	InitializeUnicodeGlyphMap();
 	/* Next "force" finding a suitable freetype font as the local font is missing. */
 	CheckForMissingGlyphs(false);
 	/* Initialise the palette. The biggest step is 'faking' some recolour sprites.
 	 * This way the mauve and gray colours work and we can show the user interface. */

0 comments (0 inline, 0 general)