Mercurial > molko

changeset 482:f78455f45bf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
examples: improve example-action more
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 18:03:16 +0100
parents 4b99b760e99c
children 6c06c82d276a
files examples/example-action/chest.c libmlk-example/CMakeLists.txt libmlk-example/assets/sounds/open-chest.wav libmlk-example/mlk/example/registry.c libmlk-example/mlk/example/registry.h
diffstat 5 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-action/chest.c	Mon Feb 27 17:57:13 2023 +0100
+++ b/examples/example-action/chest.c	Mon Feb 27 18:03:16 2023 +0100
@@ -20,6 +20,7 @@
 
 #include <mlk/core/event.h>
 #include <mlk/core/maths.h>
+#include <mlk/core/sound.h>
 #include <mlk/core/sprite.h>
 
 #include <mlk/example/registry.h>
@@ -51,7 +52,9 @@
 	if (!mlk_maths_is_boxed(chest->x, chest->y, cw, ch, ev->click.x, ev->click.y))
 		return;
 
+	mlk_sound_play(&registry_sounds[REGISTRY_SOUND_OPEN_CHEST]);
 	mlk_animation_start(&chest->animation);
+
 	chest->state = CHEST_STATE_OPENING;
 }
 
--- a/libmlk-example/CMakeLists.txt	Mon Feb 27 17:57:13 2023 +0100
+++ b/libmlk-example/CMakeLists.txt	Mon Feb 27 18:03:16 2023 +0100
@@ -40,6 +40,7 @@
 	${libmlk-example_SOURCE_DIR}/assets/images/sword.png
 	${libmlk-example_SOURCE_DIR}/assets/music/vabsounds-romance.ogg
 	${libmlk-example_SOURCE_DIR}/assets/sounds/fire.wav
+	${libmlk-example_SOURCE_DIR}/assets/sounds/open-chest.wav
 	${libmlk-example_SOURCE_DIR}/assets/sprites/chest.png
 	${libmlk-example_SOURCE_DIR}/assets/sprites/explosion.png
 	${libmlk-example_SOURCE_DIR}/assets/sprites/john-sword.png
Binary file libmlk-example/assets/sounds/open-chest.wav has changed
--- a/libmlk-example/mlk/example/registry.c	Mon Feb 27 17:57:13 2023 +0100
+++ b/libmlk-example/mlk/example/registry.c	Mon Feb 27 18:03:16 2023 +0100
@@ -28,6 +28,7 @@
 #include <assets/images/haunted-wood.h>
 
 #include <assets/sounds/fire.h>
+#include <assets/sounds/open-chest.h>
 
 #include <assets/sprites/chest.h>
 #include <assets/sprites/explosion.h>
@@ -80,7 +81,8 @@
 	const unsigned char *data;
 	size_t datasz;
 } sounds[] = {
-	REGISTRY_SOUND(REGISTRY_SOUND_FIRE, assets_sounds_fire)
+	REGISTRY_SOUND(REGISTRY_SOUND_FIRE, assets_sounds_fire),
+	REGISTRY_SOUND(REGISTRY_SOUND_OPEN_CHEST, assets_sounds_open_chest)
 };
 
 static void
--- a/libmlk-example/mlk/example/registry.h	Mon Feb 27 17:57:13 2023 +0100
+++ b/libmlk-example/mlk/example/registry.h	Mon Feb 27 18:03:16 2023 +0100
@@ -52,6 +52,7 @@
 
 enum registry_sound {
 	REGISTRY_SOUND_FIRE,
+	REGISTRY_SOUND_OPEN_CHEST,
 	REGISTRY_SOUND_LAST
 };