Mercurial > molko
changeset 500:d7855791a2b8
examples: prefix mlk
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 28 Feb 2023 15:35:17 +0100 |
parents | d3ea59fce7dc |
children | 23559c7ccf47 |
files | examples/example-action/chest.c examples/example-action/example-action.c examples/example-animation/example-animation.c examples/example-audio/example-audio.c examples/example-battle/example-battle.c examples/example-drawable/example-drawable.c examples/example-notify/example-notify.c examples/example-sprite/example-sprite.c examples/example-trace/example-trace.c libmlk-example/mlk/example/character-john.c libmlk-example/mlk/example/example.c libmlk-example/mlk/example/registry.c libmlk-example/mlk/example/registry.h libmlk-example/mlk/example/spell-fire.c libmlk-example/mlk/example/spell-fire.h libmlk-example/mlk/example/trace-hud.c libmlk-example/mlk/example/trace-hud.h tests/test-action-script.c |
diffstat | 18 files changed, 129 insertions(+), 167 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/example-action/chest.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-action/chest.c Tue Feb 28 15:35:17 2023 +0100 @@ -46,13 +46,13 @@ if (ev->type != MLK_EVENT_CLICKDOWN) return; - cw = registry_sprites[REGISTRY_TEXTURE_CHEST].cellw; - ch = registry_sprites[REGISTRY_TEXTURE_CHEST].cellh; + cw = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CHEST].cellw; + ch = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CHEST].cellh; if (!mlk_maths_is_boxed(chest->x, chest->y, cw, ch, ev->click.x, ev->click.y)) return; - mlk_sound_play(®istry_sounds[REGISTRY_SOUND_OPEN_CHEST]); + mlk_sound_play(&mlk_registry_sounds[MLK_REGISTRY_SOUND_OPEN_CHEST]); mlk_animation_start(&chest->animation); chest->state = CHEST_STATE_OPENING; @@ -112,7 +112,7 @@ chest->action.update = update; chest->action.draw = draw; - mlk_animation_init(&chest->animation, ®istry_sprites[REGISTRY_TEXTURE_CHEST], CHEST_DELAY); + mlk_animation_init(&chest->animation, &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CHEST], CHEST_DELAY); return &chest->action; }
--- a/examples/example-action/example-action.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-action/example-action.c Tue Feb 28 15:35:17 2023 +0100 @@ -247,8 +247,8 @@ * Chest #0 is at center 1st half of the screen. * Chest #1 is at center of 2nd half of the sreen. */ - const unsigned int cw = registry_sprites[REGISTRY_TEXTURE_CHEST].cellw; - const unsigned int ch = registry_sprites[REGISTRY_TEXTURE_CHEST].cellh; + const unsigned int cw = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CHEST].cellw; + const unsigned int ch = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CHEST].cellh; mlk_align(MLK_ALIGN_CENTER, &chests[0].x, &chests[0].y, cw, ch, 0, 0, MLK_EXAMPLE_W / 2, MLK_EXAMPLE_H);
--- a/examples/example-animation/example-animation.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-animation/example-animation.c Tue Feb 28 15:35:17 2023 +0100 @@ -95,8 +95,8 @@ unsigned int cellw, cellh; - cellw = registry_sprites[REGISTRY_TEXTURE_NUMBERS].cellw; - cellh = registry_sprites[REGISTRY_TEXTURE_NUMBERS].cellh; + cellw = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_NUMBERS].cellw; + cellh = mlk_registry_sprites[MLK_REGISTRY_TEXTURE_NUMBERS].cellh; mlk_painter_set_color(0x4f8fbaff); mlk_painter_clear(); @@ -117,7 +117,7 @@ .draw = draw }; - mlk_animation_init(&animation, ®istry_sprites[REGISTRY_TEXTURE_NUMBERS], 1000); + mlk_animation_init(&animation, &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_NUMBERS], 1000); mlk_game_init(states, MLK_UTIL_SIZE(states)); mlk_game_push(&state);
--- a/examples/example-audio/example-audio.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-audio/example-audio.c Tue Feb 28 15:35:17 2023 +0100 @@ -61,8 +61,8 @@ if ((err = mlk_example_init("example-audio")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - sound = ®istry_sounds[REGISTRY_SOUND_FIRE]; - music = ®istry_music[REGISTRY_MUSIC_ROMANCE]; + sound = &mlk_registry_sounds[MLK_REGISTRY_SOUND_FIRE]; + music = &mlk_registry_music[MLK_REGISTRY_MUSIC_ROMANCE]; } static void
--- a/examples/example-battle/example-battle.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-battle/example-battle.c Tue Feb 28 15:35:17 2023 +0100 @@ -118,7 +118,7 @@ .level = 30, .reset = haunted_wood_reset, .sprites = { - [CHARACTER_SPRITE_NORMAL] = ®istry_sprites[REGISTRY_TEXTURE_HAUNTED_WOOD], + [CHARACTER_SPRITE_NORMAL] = ®istry_sprites[MLK_REGISTRY_TEXTURE_HAUNTED_WOOD], }, .exec = haunted_wood_strat }; @@ -133,10 +133,9 @@ if ((err = mlk_example_init("example-battle")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - registry_init(); - /* Set cursor in default theme. */ - mlk_theme_default()->sprites[MLK_THEME_SPRITE_CURSOR] = ®istry_sprites[REGISTRY_TEXTURE_CURSOR]; + mlk_registry_init(); + mlk_theme_default()->sprites[MLK_THEME_SPRITE_CURSOR] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_CURSOR]; } static struct mlk_state *states[2]; @@ -153,7 +152,7 @@ .level = 6, .reset = black_cat_reset, .sprites = { - [CHARACTER_SPRITE_NORMAL] = ®istry_sprites[REGISTRY_TEXTURE_BLACK_CAT], + [CHARACTER_SPRITE_NORMAL] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_BLACK_CAT], }, .exec = black_cat_strat }, @@ -171,11 +170,11 @@ .mp = 50, .reset = adventurer_reset, .sprites = { - [CHARACTER_SPRITE_NORMAL] = ®istry_sprites[REGISTRY_TEXTURE_JOHN_WALK], - [CHARACTER_SPRITE_SWORD] = ®istry_sprites[REGISTRY_TEXTURE_JOHN_SWORD], + [CHARACTER_SPRITE_NORMAL] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_JOHN_WALK], + [CHARACTER_SPRITE_SWORD] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_JOHN_SWORD], }, .spells = { - &spell_fire + &mlk_spell_fire } }, .entity = { @@ -218,7 +217,7 @@ entities_enemies[0]->x = 500; entities_enemies[0]->y = 100; - bt.background = ®istry_images[REGISTRY_IMAGE_BATTLE_BACKGROUND]; + bt.background = &mlk_registry_images[MLK_REGISTRY_IMAGE_BATTLE_BACKGROUND]; bt.bar = &bar; bt.actions = &action_stack; bt.effects = &drawable_stack;
--- a/examples/example-drawable/example-drawable.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-drawable/example-drawable.c Tue Feb 28 15:35:17 2023 +0100 @@ -77,8 +77,8 @@ if ((err = mlk_example_init("example-drawable")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - explosion_tex = ®istry_textures[REGISTRY_TEXTURE_EXPLOSION]; - explosion_sprite = ®istry_sprites[REGISTRY_TEXTURE_EXPLOSION]; + explosion_tex = &mlk_registry_textures[MLK_REGISTRY_TEXTURE_EXPLOSION]; + explosion_sprite = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_EXPLOSION]; } static int
--- a/examples/example-notify/example-notify.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-notify/example-notify.c Tue Feb 28 15:35:17 2023 +0100 @@ -53,7 +53,7 @@ if ((err = mlk_example_init("example-notify")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - icon = ®istry_textures[REGISTRY_TEXTURE_SWORD]; + icon = &mlk_registry_textures[MLK_REGISTRY_TEXTURE_SWORD]; } static void
--- a/examples/example-sprite/example-sprite.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-sprite/example-sprite.c Tue Feb 28 15:35:17 2023 +0100 @@ -69,7 +69,7 @@ if ((err = mlk_example_init("example-sprite")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - sprite = ®istry_sprites[REGISTRY_TEXTURE_PEOPLE]; + sprite = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_PEOPLE]; } static void
--- a/examples/example-trace/example-trace.c Tue Feb 28 13:50:35 2023 +0100 +++ b/examples/example-trace/example-trace.c Tue Feb 28 15:35:17 2023 +0100 @@ -44,7 +44,7 @@ if ((err = mlk_example_init("example-trace")) < 0) mlk_panicf("mlk_example_init: %s", mlk_err_string(err)); - mlk_trace_handler = trace_hud_handler; + mlk_trace_handler = mlk_trace_hud_handler; } static void @@ -56,7 +56,7 @@ case MLK_EVENT_KEYDOWN: switch (ev->key.key) { case MLK_KEY_ESCAPE: - trace_hud_clear(); + mlk_trace_hud_clear(); break; default: mlk_tracef("keydown pressed: %d", ev->key.key); @@ -79,7 +79,7 @@ { (void)st; - trace_hud_update(ticks); + mlk_trace_hud_update(ticks); } static void @@ -89,7 +89,7 @@ mlk_painter_set_color(0x4f8fbaff); mlk_painter_clear(); - trace_hud_draw(); + mlk_trace_hud_draw(); mlk_painter_present(); }
--- a/libmlk-example/mlk/example/character-john.c Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/character-john.c Tue Feb 28 15:35:17 2023 +0100 @@ -41,10 +41,10 @@ .mp = 50, .reset = adventurer_reset, .sprites = { - [CHARACTER_SPRITE_NORMAL] = ®istry_sprites[REGISTRY_TEXTURE_JOHN_WALK], - [CHARACTER_SPRITE_SWORD] = ®istry_sprites[REGISTRY_TEXTURE_JOHN_SWORD] + [CHARACTER_SPRITE_NORMAL] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_JOHN_WALK], + [CHARACTER_SPRITE_SWORD] = &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_JOHN_SWORD] }, .spells = { - &spell_fire + &mlk_spell_fire } };
--- a/libmlk-example/mlk/example/example.c Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/example.c Tue Feb 28 15:35:17 2023 +0100 @@ -45,7 +45,7 @@ if (mlk_window_open(name, MLK_EXAMPLE_W, MLK_EXAMPLE_H) < 0) return err; - registry_init(); + mlk_registry_init(); return 0; }
--- a/libmlk-example/mlk/example/registry.c Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/registry.c Tue Feb 28 15:35:17 2023 +0100 @@ -43,66 +43,63 @@ #include "registry.h" -struct mlk_texture registry_images[REGISTRY_IMAGE_LAST] = {0}; -struct mlk_texture registry_textures[REGISTRY_TEXTURE_LAST] = {0}; -struct mlk_sprite registry_sprites[REGISTRY_TEXTURE_LAST] = {0}; -struct mlk_sound registry_sounds[REGISTRY_SOUND_LAST] = {0}; -struct mlk_music registry_music[REGISTRY_MUSIC_LAST] = {0}; +struct mlk_texture mlk_registry_images[MLK_REGISTRY_IMAGE_LAST] = {0}; +struct mlk_texture mlk_registry_textures[MLK_REGISTRY_TEXTURE_LAST] = {0}; +struct mlk_sprite mlk_registry_sprites[MLK_REGISTRY_TEXTURE_LAST] = {0}; +struct mlk_sound mlk_registry_sounds[MLK_REGISTRY_SOUND_LAST] = {0}; +struct mlk_music mlk_registry_music[MLK_REGISTRY_MUSIC_LAST] = {0}; -#define REGISTRY_IMAGE(i, data) \ +#define MLK_REGISTRY_IMAGE(i, data) \ { (i), (data), sizeof (data) } +#define MLK_REGISTRY_TEXTURE(s, data, cw, ch) \ + { (s), (data), sizeof (data), (cw), (ch) } +#define MLK_REGISTRY_SOUND(s, data) \ + { (s), (data), sizeof (data) } +#define MLK_REGISTRY_MUSIC(m, data) \ + { (m), (data), sizeof (data) } static const struct { - enum registry_image index; + enum mlk_registry_image index; const unsigned char *data; size_t datasz; } images[] = { - REGISTRY_IMAGE(REGISTRY_IMAGE_BATTLE_BACKGROUND, assets_images_battle_background) + MLK_REGISTRY_IMAGE(MLK_REGISTRY_IMAGE_BATTLE_BACKGROUND, assets_images_battle_background) }; -#define REGISTRY_TEXTURE(s, data, cw, ch) \ - { (s), (data), sizeof (data), (cw), (ch) } - static const struct { - enum registry_texture index; + enum mlk_registry_texture index; const unsigned char *data; size_t datasz; unsigned int cellw; unsigned int cellh; } textures[] = { - REGISTRY_TEXTURE(REGISTRY_TEXTURE_CURSOR, assets_sprites_ui_cursor, 24, 24), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_EXPLOSION, assets_sprites_explosion, 256, 256), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_JOHN_SWORD, assets_sprites_john_sword, 256, 256), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_JOHN_WALK, assets_sprites_john_walk, 256, 256), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_HAUNTED_WOOD, assets_images_haunted_wood, 0, 0), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_BLACK_CAT, assets_images_black_cat, 0, 0), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_CHEST, assets_sprites_chest, 32, 32), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_NUMBERS, assets_sprites_numbers, 48, 48), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_SWORD, assets_images_sword, 0, 0), - REGISTRY_TEXTURE(REGISTRY_TEXTURE_PEOPLE, assets_sprites_people, 48, 48) + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_CURSOR, assets_sprites_ui_cursor, 24, 24), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_EXPLOSION, assets_sprites_explosion, 256, 256), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_JOHN_SWORD, assets_sprites_john_sword, 256, 256), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_JOHN_WALK, assets_sprites_john_walk, 256, 256), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_HAUNTED_WOOD, assets_images_haunted_wood, 0, 0), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_BLACK_CAT, assets_images_black_cat, 0, 0), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_CHEST, assets_sprites_chest, 32, 32), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_NUMBERS, assets_sprites_numbers, 48, 48), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_SWORD, assets_images_sword, 0, 0), + MLK_REGISTRY_TEXTURE(MLK_REGISTRY_TEXTURE_PEOPLE, assets_sprites_people, 48, 48) }; -#define REGISTRY_SOUND(s, data) \ - { (s), (data), sizeof (data) } - static const struct { - enum registry_sound index; + enum mlk_registry_sound index; const unsigned char *data; size_t datasz; } sounds[] = { - REGISTRY_SOUND(REGISTRY_SOUND_FIRE, assets_sounds_fire), - REGISTRY_SOUND(REGISTRY_SOUND_OPEN_CHEST, assets_sounds_open_chest) + MLK_REGISTRY_SOUND(MLK_REGISTRY_SOUND_FIRE, assets_sounds_fire), + MLK_REGISTRY_SOUND(MLK_REGISTRY_SOUND_OPEN_CHEST, assets_sounds_open_chest) }; -#define REGISTRY_MUSIC(m, data) \ - { (m), (data), sizeof (data) } - static const struct { - enum registry_music index; + enum mlk_registry_music index; const unsigned char *data; size_t datasz; } musics[] = { - REGISTRY_MUSIC(REGISTRY_MUSIC_ROMANCE, assets_music_vabsounds_romance) + MLK_REGISTRY_MUSIC(MLK_REGISTRY_MUSIC_ROMANCE, assets_music_vabsounds_romance) }; static void @@ -112,7 +109,7 @@ struct mlk_texture *texture; for (size_t i = 0; i < MLK_UTIL_SIZE(images); ++i) { - texture = ®istry_images[images[i].index]; + texture = &mlk_registry_images[images[i].index]; if ((err = mlk_image_openmem(texture, images[i].data, images[i].datasz)) < 0) mlk_panic(err); @@ -127,8 +124,8 @@ int err; for (size_t i = 0; i < MLK_UTIL_SIZE(textures); ++i) { - texture = ®istry_textures[textures[i].index]; - sprite = ®istry_sprites[textures[i].index]; + texture = &mlk_registry_textures[textures[i].index]; + sprite = &mlk_registry_sprites[textures[i].index]; if ((err = mlk_image_openmem(texture, textures[i].data, textures[i].datasz)) < 0) mlk_panic(err); @@ -147,7 +144,7 @@ struct mlk_sound *sound; for (size_t i = 0; i < MLK_UTIL_SIZE(sounds); ++i) { - sound = ®istry_sounds[sounds[i].index]; + sound = &mlk_registry_sounds[sounds[i].index]; if ((err = mlk_sound_openmem(sound, sounds[i].data, sounds[i].datasz)) < 0) mlk_panic(err); @@ -161,7 +158,7 @@ struct mlk_music *music; for (size_t i = 0; i < MLK_UTIL_SIZE(musics); ++i) { - music = ®istry_music[musics[i].index]; + music = &mlk_registry_music[musics[i].index]; if ((err = mlk_music_openmem(music, musics[i].data, musics[i].datasz)) < 0) mlk_panic(err); @@ -169,7 +166,7 @@ } void -registry_init(void) +mlk_registry_init(void) { load_images(); load_textures_and_sprites(); @@ -178,14 +175,14 @@ } void -registry_finish(void) +mlk_registry_finish(void) { - for (size_t i = 0; i < MLK_UTIL_SIZE(registry_images); ++i) - mlk_texture_finish(®istry_images[i]); - for (size_t i = 0; i < MLK_UTIL_SIZE(registry_textures); ++i) - mlk_texture_finish(®istry_textures[i]); - for (size_t i = 0; i < MLK_UTIL_SIZE(registry_sounds); ++i) - mlk_sound_finish(®istry_sounds[i]); - for (size_t i = 0; i < MLK_UTIL_SIZE(registry_music); ++i) - mlk_music_finish(®istry_music[i]); + for (size_t i = 0; i < MLK_UTIL_SIZE(mlk_registry_images); ++i) + mlk_texture_finish(&mlk_registry_images[i]); + for (size_t i = 0; i < MLK_UTIL_SIZE(mlk_registry_textures); ++i) + mlk_texture_finish(&mlk_registry_textures[i]); + for (size_t i = 0; i < MLK_UTIL_SIZE(mlk_registry_sounds); ++i) + mlk_sound_finish(&mlk_registry_sounds[i]); + for (size_t i = 0; i < MLK_UTIL_SIZE(mlk_registry_music); ++i) + mlk_music_finish(&mlk_registry_music[i]); }
--- a/libmlk-example/mlk/example/registry.h Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/registry.h Tue Feb 28 15:35:17 2023 +0100 @@ -24,59 +24,59 @@ #include <mlk/core/sprite.h> #include <mlk/core/texture.h> -enum registry_texture { +enum mlk_registry_texture { /* UI. */ - REGISTRY_TEXTURE_CURSOR, - REGISTRY_TEXTURE_NUMBERS, + MLK_REGISTRY_TEXTURE_CURSOR, + MLK_REGISTRY_TEXTURE_NUMBERS, /* Animations. */ - REGISTRY_TEXTURE_EXPLOSION, + MLK_REGISTRY_TEXTURE_EXPLOSION, /* Characters. */ - REGISTRY_TEXTURE_JOHN_WALK, - REGISTRY_TEXTURE_JOHN_SWORD, - REGISTRY_TEXTURE_PEOPLE, + MLK_REGISTRY_TEXTURE_JOHN_WALK, + MLK_REGISTRY_TEXTURE_JOHN_SWORD, + MLK_REGISTRY_TEXTURE_PEOPLE, /* Enemies. */ - REGISTRY_TEXTURE_HAUNTED_WOOD, - REGISTRY_TEXTURE_BLACK_CAT, + MLK_REGISTRY_TEXTURE_HAUNTED_WOOD, + MLK_REGISTRY_TEXTURE_BLACK_CAT, /* Objects. */ - REGISTRY_TEXTURE_CHEST, + MLK_REGISTRY_TEXTURE_CHEST, /* Sword by Icongeek26 (https://www.flaticon.com). */ - REGISTRY_TEXTURE_SWORD, + MLK_REGISTRY_TEXTURE_SWORD, /* Unused.*/ - REGISTRY_TEXTURE_LAST + MLK_REGISTRY_TEXTURE_LAST }; -enum registry_image { - REGISTRY_IMAGE_BATTLE_BACKGROUND, - REGISTRY_IMAGE_LAST +enum mlk_registry_image { + MLK_REGISTRY_IMAGE_BATTLE_BACKGROUND, + MLK_REGISTRY_IMAGE_LAST }; -enum registry_sound { - REGISTRY_SOUND_FIRE, - REGISTRY_SOUND_OPEN_CHEST, - REGISTRY_SOUND_LAST +enum mlk_registry_sound { + MLK_REGISTRY_SOUND_FIRE, + MLK_REGISTRY_SOUND_OPEN_CHEST, + MLK_REGISTRY_SOUND_LAST }; -enum registry_music { - REGISTRY_MUSIC_ROMANCE, - REGISTRY_MUSIC_LAST +enum mlk_registry_music { + MLK_REGISTRY_MUSIC_ROMANCE, + MLK_REGISTRY_MUSIC_LAST }; -extern struct mlk_texture registry_images[REGISTRY_IMAGE_LAST]; -extern struct mlk_texture registry_textures[REGISTRY_TEXTURE_LAST]; -extern struct mlk_sprite registry_sprites[REGISTRY_TEXTURE_LAST]; -extern struct mlk_sound registry_sounds[REGISTRY_SOUND_LAST]; -extern struct mlk_music registry_music[REGISTRY_MUSIC_LAST]; +extern struct mlk_texture mlk_registry_images[MLK_REGISTRY_IMAGE_LAST]; +extern struct mlk_texture mlk_registry_textures[MLK_REGISTRY_TEXTURE_LAST]; +extern struct mlk_sprite mlk_registry_sprites[MLK_REGISTRY_TEXTURE_LAST]; +extern struct mlk_sound mlk_registry_sounds[MLK_REGISTRY_SOUND_LAST]; +extern struct mlk_music mlk_registry_music[MLK_REGISTRY_MUSIC_LAST]; void -registry_init(void); +mlk_registry_init(void); void -registry_finish(void); +mlk_registry_finish(void); #endif /* !EXAMPLES_BATTLE_REGISTRY_H */
--- a/libmlk-example/mlk/example/spell-fire.c Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/spell-fire.c Tue Feb 28 15:35:17 2023 +0100 @@ -113,14 +113,14 @@ self->drawable.finish = finish; self->drawable.end = end; - mlk_animation_init(&self->animation, ®istry_sprites[REGISTRY_TEXTURE_EXPLOSION], 12); + mlk_animation_init(&self->animation, &mlk_registry_sprites[MLK_REGISTRY_TEXTURE_EXPLOSION], 12); mlk_animation_start(&self->animation); - mlk_sound_play(®istry_sounds[REGISTRY_SOUND_FIRE]); + mlk_sound_play(&mlk_registry_sounds[MLK_REGISTRY_SOUND_FIRE]); battle_state_rendering(bt, &self->drawable); } -const struct spell spell_fire = { +const struct spell mlk_spell_fire = { .name = "Fire", .description = "A delicate fire.", .mp = 5,
--- a/libmlk-example/mlk/example/spell-fire.h Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/spell-fire.h Tue Feb 28 15:35:17 2023 +0100 @@ -19,6 +19,6 @@ #ifndef EXAMPLES_BATTLE_SPELL_FIRE_H #define EXAMPLES_BATTLE_SPELL_FIRE_H -extern const struct spell spell_fire; +extern const struct spell mlk_spell_fire; #endif /* !EXAMPLES_BATTLE_SPELL_FIRE_H */
--- a/libmlk-example/mlk/example/trace-hud.c Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/trace-hud.c Tue Feb 28 15:35:17 2023 +0100 @@ -20,7 +20,6 @@ #include <stdio.h> #include <string.h> -#include <mlk/core/action.h> #include <mlk/core/font.h> #include <mlk/core/trace.h> #include <mlk/core/window.h> @@ -38,12 +37,12 @@ unsigned int elapsed; } data; -struct trace_hud trace_hud = { - .timeout = TRACE_HUD_TIMEOUT_DEFAULT +struct mlk_trace_hud mlk_trace_hud = { + .timeout = MLK_TRACE_HUD_TIMEOUT_DEFAULT }; void -trace_hud_handler(const char *str) +mlk_trace_hud_handler(const char *str) { assert(str); @@ -64,7 +63,7 @@ } void -trace_hud_update(unsigned int ticks) +mlk_trace_hud_update(unsigned int ticks) { data.elapsed += ticks; @@ -79,19 +78,19 @@ * [n] = "ldkf" * [LINES_MAX + 1] = "\0" */ - if (data.elapsed >= trace_hud.timeout) { + if (data.elapsed >= mlk_trace_hud.timeout) { data.elapsed = 0; memmove(&data.lines[0], &data.lines[1], sizeof (data.lines[0]) * LINES_MAX); } } void -trace_hud_draw(void) +mlk_trace_hud_draw(void) { struct mlk_theme *th; int x, y; - th = THEME(trace_hud.theme); + th = THEME(mlk_trace_hud.theme); x = th->padding; y = th->padding; @@ -110,36 +109,7 @@ } void -trace_hud_clear(void) +mlk_trace_hud_clear(void) { memset(&data, 0, sizeof (data)); } - -static int -update(struct mlk_action *a, unsigned int ticks) -{ - (void)a; - - trace_hud_update(ticks); - - return 0; -} - -static void -draw(struct mlk_action *a) -{ - (void)a; - - trace_hud_draw(); -} - -struct mlk_action * -trace_hud_action(void) -{ - static struct mlk_action a = { - .update = update, - .draw = draw - }; - - return &a; -}
--- a/libmlk-example/mlk/example/trace-hud.h Tue Feb 28 13:50:35 2023 +0100 +++ b/libmlk-example/mlk/example/trace-hud.h Tue Feb 28 15:35:17 2023 +0100 @@ -19,31 +19,27 @@ #ifndef EXAMPLES_TRACE_TRACE_HUD_H #define EXAMPLES_TRACE_TRACE_HUD_H -#define TRACE_HUD_TIMEOUT_DEFAULT (3000) +#define MLK_TRACE_HUD_TIMEOUT_DEFAULT (3000) -struct action; struct mlk_theme; -struct trace_hud { +struct mlk_trace_hud { struct mlk_theme *theme; unsigned int timeout; }; -extern struct trace_hud trace_hud; +extern struct mlk_trace_hud mlk_trace_hud; void -trace_hud_handler(const char *); - -void -trace_hud_update(unsigned int); +mlk_trace_hud_handler(const char *); void -trace_hud_draw(void); +mlk_trace_hud_update(unsigned int); void -trace_hud_clear(void); +mlk_trace_hud_draw(void); -struct mlk_action * -trace_hud_action(void); +void +mlk_trace_hud_clear(void); #endif /* !EXAMPLES_TRACE_TRACE_HUD_H */
--- a/tests/test-action-script.c Tue Feb 28 13:50:35 2023 +0100 +++ b/tests/test-action-script.c Tue Feb 28 15:35:17 2023 +0100 @@ -155,7 +155,7 @@ { .act = INIT(&table[2].inv, my_update_false) } }; - struct mlk_action array[3] = {0}; + struct mlk_action *array[3] = {0}; struct mlk_action_script sc = {0}; mlk_action_script_init(&sc, array, 3); @@ -237,7 +237,7 @@ { .act = INIT(&table[2].inv, my_update_false) } }; - struct mlk_action array[3]; + struct mlk_action *array[3]; struct mlk_action_script sc = {0}; mlk_action_script_init(&sc, array, 3); @@ -350,7 +350,7 @@ { .act = INIT(&table[2].inv, my_update_false) } }; - struct mlk_action array[3]; + struct mlk_action *array[3]; struct mlk_action_script sc = {0}; mlk_action_script_init(&sc, array, 3); @@ -430,7 +430,7 @@ { .act = INIT(&table[2].inv, my_update_false) } }; - struct mlk_action array[3]; + struct mlk_action *array[3]; struct mlk_action_script sc = {0}; mlk_action_script_init(&sc, array, 3);