From 3409da9aa141ffd749e2ca3a3c9ac3e9774dc249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Tue, 4 Apr 2017 15:27:22 +0200 Subject: [PATCH] Only load csg1 if necessary --- src/openrct2/drawing/sprite.cpp | 5 +++++ src/openrct2/rct2.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openrct2/drawing/sprite.cpp b/src/openrct2/drawing/sprite.cpp index f58c1752ad..e4f031d1b4 100644 --- a/src/openrct2/drawing/sprite.cpp +++ b/src/openrct2/drawing/sprite.cpp @@ -629,6 +629,11 @@ extern "C" { return &_g2.elements[image_id - SPR_G2_BEGIN]; } + + if (_csg.data == nullptr) + { + gfx_load_csg(); + } return &_csg.elements[image_id - SPR_CSG_BEGIN]; } diff --git a/src/openrct2/rct2.c b/src/openrct2/rct2.c index ff5761e6f8..873d70be2a 100644 --- a/src/openrct2/rct2.c +++ b/src/openrct2/rct2.c @@ -163,7 +163,6 @@ bool rct2_init() if (!gfx_load_g2()) { return false; } - gfx_load_csg(); font_sprite_initialise_characters(); if (!gOpenRCT2Headless) {