From 9991bb93a01cb12af1e0a22af273ee08534eef5e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 24 Jul 2022 22:29:42 +0300 Subject: [PATCH 48/48] Client: Initialize unscaled_tileset See osdn #45130 Signed-off-by: Marko Lindqvist --- client/tilespec.c | 4 ++-- client/tilespec.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/tilespec.c b/client/tilespec.c index 4477240c64..e2add9bc05 100644 --- a/client/tilespec.c +++ b/client/tilespec.c @@ -557,7 +557,7 @@ struct tileset { }; struct tileset *tileset; -struct tileset *unscaled_tileset; +struct tileset *unscaled_tileset = NULL; int focus_unit_state = 0; @@ -679,7 +679,7 @@ static void drawing_data_destroy(struct drawing_data *draw) /************************************************************************//** Return unscaled tileset if it exists, or default otherwise ****************************************************************************/ -struct tileset* get_tileset(void) +struct tileset *get_tileset(void) { if (unscaled_tileset != NULL) { return unscaled_tileset; diff --git a/client/tilespec.h b/client/tilespec.h index 6b7818a6d4..6cb48c1bf7 100644 --- a/client/tilespec.h +++ b/client/tilespec.h @@ -420,7 +420,7 @@ struct color_system; struct color_system *get_color_system(const struct tileset *t); /* Tileset accessor functions. */ -struct tileset* get_tileset(void); +struct tileset *get_tileset(void); const char *tileset_basename(const struct tileset *t); bool tileset_is_isometric(const struct tileset *t); int tileset_hex_width(const struct tileset *t); -- 2.35.1