File diff r23482:de566f8c088d → r23483:3733e6b8ff17
src/bootstrap_gui.cpp
Show inline comments
 
@@ -10,13 +10,13 @@
 
/** @file bootstrap_gui.cpp Barely used user interface for bootstrapping OpenTTD, i.e. downloading the required content. */
 

	
 
#include "stdafx.h"
 
#include "base_media_base.h"
 
#include "blitter/factory.hpp"
 

	
 
#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE)
 
#if defined(WITH_FREETYPE)
 

	
 
#include "core/geometry_func.hpp"
 
#include "fontcache.h"
 
#include "gfx_func.h"
 
#include "network/network.h"
 
#include "network/network_content_gui.h"
 
@@ -201,13 +201,13 @@ public:
 
		_network_content_client.Select(ci->id);
 
		new BootstrapContentDownloadStatusWindow();
 
		delete this;
 
	}
 
};
 

	
 
#endif /* defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) */
 
#endif /* defined(WITH_FREETYPE) */
 

	
 
/**
 
 * Handle all procedures for bootstrapping OpenTTD without a base graphics set.
 
 * 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.
 
@@ -217,13 +217,13 @@ bool HandleBootstrap()
 
	if (BaseGraphics::GetUsedSet() != NULL) return true;
 

	
 
	/* No user interface, bail out with an error. */
 
	if (BlitterFactory::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(WITH_FONTCONFIG) || defined(_WIN32) || defined(__APPLE__))
 
#if defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(_WIN32) || defined(__APPLE__))
 
	if (!_network_available) goto failure;
 

	
 
	/* First tell the game we're bootstrapping. */
 
	_game_mode = GM_BOOTSTRAP;
 

	
 
	/* Initialise the freetype font code. */