Mercurial > molko
diff libmlk-rpg/mlk/rpg/tileset-file.c @ 474:ca30ff96bbe0
core: util -> mlk_util
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 27 Feb 2023 12:41:53 +0100 |
parents | bc5483849614 |
children | d6757c30658e |
line wrap: on
line diff
--- a/libmlk-rpg/mlk/rpg/tileset-file.c Mon Feb 27 11:26:23 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/tileset-file.c Mon Feb 27 12:41:53 2023 +0100 @@ -193,7 +193,7 @@ while (fscanf(ctx->fp, "%hu|" MAX_F(FILENAME_MAX) "|%u", &id, filename, &delay) == 3) { anim = mlk_alloc_pool_new(&ctx->tf->anims[0]); - if (mlk_image_open(&anim->texture, util_pathf("%s/%s", ctx->basedir, filename)) < 0) + if (mlk_image_open(&anim->texture, mlk_util_pathf("%s/%s", ctx->basedir, filename)) < 0) return -1; mlk_sprite_init(&anim->sprite, &anim->texture, ctx->tilewidth, ctx->tileheight); @@ -236,7 +236,7 @@ if (!(p = strchr(line, '|'))) return errorf("could not parse image"); - if (mlk_image_open(&ctx->tf->image, util_pathf("%s/%s", ctx->basedir, p + 1)) < 0) + if (mlk_image_open(&ctx->tf->image, mlk_util_pathf("%s/%s", ctx->basedir, p + 1)) < 0) return -1; mlk_sprite_init(&ctx->tf->sprite, &ctx->tf->image, ctx->tilewidth, ctx->tileheight); @@ -259,7 +259,7 @@ { "image", parse_image } }; - for (size_t i = 0; i < UTIL_SIZE(props); ++i) { + for (size_t i = 0; i < MLK_UTIL_SIZE(props); ++i) { if (strncmp(line, props[i].property, strlen(props[i].property)) == 0) return props[i].read(ctx, line); }