From 4a179629c4b5b9e4ca612d1f1b695e0fe74cf506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boldizs=C3=A1r=20Lipka?= Date: Wed, 11 Jun 2014 22:02:56 +0200 Subject: [PATCH] Load the logo from the texture cache. --- src/loadscreen.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/loadscreen.cpp b/src/loadscreen.cpp index b5dbe778081c..8a153d7d4124 100644 --- a/src/loadscreen.cpp +++ b/src/loadscreen.cpp @@ -71,7 +71,7 @@ loadscreen::loadscreen(CVideo &screen, const int percent): screen_(screen), textarea_(), #if SDL_VERSION_ATLEAST(2,0,0) - logo_texture_(), + logo_texture_(image::get_texture("misc/logo.png")), #else logo_surface_(image::get_image("misc/logo.png")), #endif @@ -80,12 +80,9 @@ loadscreen::loadscreen(CVideo &screen, const int percent): prcnt_(percent) { #if SDL_VERSION_ATLEAST(2,0,0) - surface surf = image::get_image("misc/logo.png"); - if (surf.null()) { + if (logo_texture_.null()) { ERR_DP << "loadscreen: Failed to load the logo" << std::endl; } - - logo_texture_ = CVideo::get_window()->create_texture(SDL_TEXTUREACCESS_STATIC, surf); #else if (logo_surface_.null()) { ERR_DP << "loadscreen: Failed to load the logo" << std::endl;