Mercurial > molko

changeset 464:b6b1162dafa3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: forgot to refactor music enum
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 09:57:15 +0100
parents 61f2334e1c54
children 01f5580e43d1
files examples/example-audio/example-audio.c libmlk-core/mlk/core/music.c libmlk-core/mlk/core/music.h libmlk-rpg/mlk/rpg/battle-state-lost.c libmlk-rpg/mlk/rpg/battle-state-victory.c libmlk-rpg/mlk/rpg/battle.c
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-audio/example-audio.c	Mon Feb 27 09:55:47 2023 +0100
+++ b/examples/example-audio/example-audio.c	Mon Feb 27 09:57:15 2023 +0100
@@ -98,7 +98,7 @@
 			mlk_music_stop(&music);
 			break;
 		case MLK_KEY_l:
-			mlk_music_play(&music, MUSIC_LOOP);
+			mlk_music_play(&music, MLK_MUSIC_LOOP);
 			break;
 		case MLK_KEY_SPACE:
 			mlk_music_play(&music, 0);
--- a/libmlk-core/mlk/core/music.c	Mon Feb 27 09:55:47 2023 +0100
+++ b/libmlk-core/mlk/core/music.c	Mon Feb 27 09:57:15 2023 +0100
@@ -54,7 +54,7 @@
 {
 	assert(mus);
 
-	if (flags & MUSIC_LOOP)
+	if (flags & MLK_MUSIC_LOOP)
 		alSourcei(SOURCE(mus), AL_LOOPING, AL_TRUE);
 	else
 		alSourcei(SOURCE(mus), AL_LOOPING, AL_TRUE);
--- a/libmlk-core/mlk/core/music.h	Mon Feb 27 09:55:47 2023 +0100
+++ b/libmlk-core/mlk/core/music.h	Mon Feb 27 09:57:15 2023 +0100
@@ -24,8 +24,8 @@
 #include "core.h"
 
 enum mlk_music_flags {
-	MUSIC_NONE      = 0,
-	MUSIC_LOOP      = (1 << 0)
+	MLK_MUSIC_NONE  = 0,
+	MLK_MUSIC_LOOP  = (1 << 0)
 };
 
 struct mlk_music {
--- a/libmlk-rpg/mlk/rpg/battle-state-lost.c	Mon Feb 27 09:55:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-lost.c	Mon Feb 27 09:57:15 2023 +0100
@@ -82,7 +82,7 @@
 	bt->status = BATTLE_STATUS_LOST;
 
 	if (bt->music[2])
-		mlk_music_play(bt->music[2], MUSIC_NONE);
+		mlk_music_play(bt->music[2], MLK_MUSIC_NONE);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-victory.c	Mon Feb 27 09:55:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-victory.c	Mon Feb 27 09:57:15 2023 +0100
@@ -83,7 +83,7 @@
 	bt->status = BATTLE_STATUS_WON;
 
 	if (bt->music[1])
-		mlk_music_play(bt->music[1], MUSIC_NONE);
+		mlk_music_play(bt->music[1], MLK_MUSIC_NONE);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle.c	Mon Feb 27 09:55:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle.c	Mon Feb 27 09:57:15 2023 +0100
@@ -244,7 +244,7 @@
 
 	/* Play music if present. */
 	if (bt->music[0])
-		mlk_music_play(bt->music[0], MUSIC_LOOP);
+		mlk_music_play(bt->music[0], MLK_MUSIC_LOOP);
 
 	battle_order(bt);
 }