From 407462847d271a4b624bc03ca631b569b5c89d93 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 13 Nov 2022 03:14:19 +0200 Subject: [PATCH 26/26] sdl2: Rename ensure_big_sprite() as theme_ensure_big_sprite() More namespace to distinguish the function from client-common one. See osdn #45851 Signed-off-by: Marko Lindqvist --- client/gui-sdl2/themespec.c | 6 +++--- client/gui-sdl2/themespec.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/gui-sdl2/themespec.c b/client/gui-sdl2/themespec.c index ebff3ccd4a..7fc18f248e 100644 --- a/client/gui-sdl2/themespec.c +++ b/client/gui-sdl2/themespec.c @@ -477,7 +477,7 @@ static struct sprite *load_gfx_file(const char *gfx_filename) /************************************************************************//** Ensure that the big sprite of the given spec file is loaded. ****************************************************************************/ -static void ensure_big_sprite(struct specfile *sf) +static void theme_ensure_big_sprite(struct specfile *sf) { struct section_file *file; const char *gfx_filename; @@ -487,7 +487,7 @@ static void ensure_big_sprite(struct specfile *sf) return; } - /* Otherwise load it. The big sprite will sometimes be freed and will have + /* Otherwise load it. The big sprite will sometimes be freed and will have * to be reloaded, but most of the time it's just loaded once, the small * sprites are extracted, and then it's freed. */ if (!(file = secfile_load(sf->file_name, TRUE))) { @@ -865,7 +865,7 @@ static struct sprite *theme_load_sprite(struct theme *t, const char *tag_name) } else { int sf_w, sf_h; - ensure_big_sprite(ss->sf); + theme_ensure_big_sprite(ss->sf); get_sprite_dimensions(ss->sf->big_sprite, &sf_w, &sf_h); if (ss->x < 0 || ss->x + ss->width > sf_w || ss->y < 0 || ss->y + ss->height > sf_h) { diff --git a/client/gui-sdl2/themespec.h b/client/gui-sdl2/themespec.h index 839fed64dd..c99b1dc6af 100644 --- a/client/gui-sdl2/themespec.h +++ b/client/gui-sdl2/themespec.h @@ -11,7 +11,7 @@ GNU General Public License for more details. ***********************************************************************/ -/********************************************************************** +/*********************************************************************** Reading and using the themespec files, which describe the files and contents of themes. ***********************************************************************/ @@ -58,9 +58,9 @@ struct theme_background_system *theme_get_background_system(const struct theme * char *themespec_gfx_filename(const char *gfx_filename); -/* theme accessor functions. */ +/* Theme accessor functions. */ const char *theme_get_name(const struct theme *t); const char *theme_font_filename(const struct theme *t); int theme_default_font_size(const struct theme *t); -#endif /* FC__THEMESPEC_H */ +#endif /* FC__THEMESPEC_H */ -- 2.35.1