From 915ea59ca32dd420166832cccf4dd98d3d362686 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 14 Aug 2018 16:59:49 +0200 Subject: [PATCH] Fixes a mistake in music loading. --- src/mixer.c | 4 ++-- src/player.c | 2 +- src/player.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mixer.c b/src/mixer.c index 35613e2..eec18c9 100644 --- a/src/mixer.c +++ b/src/mixer.c @@ -28,11 +28,11 @@ static Mix_Music *current_song = NULL; static Music loaded_song = LAST_MUSIC; static char *music[LAST_MUSIC] = { + "Sounds/Music/fantasy-forest-battle.ogg", // MENU_MUSIC "Sounds/Music/fantasy-game-background-looping.ogg", // GAME_MUSIC0 "Sounds/Music/bog-creatures-on-the-move-looping.ogg", // GAME_MUSIC1 "Sounds/Music/fantascape-looping.ogg", // GAME_MUSIC2 - "Sounds/Music/forward-assault.ogg", // BOSS_MUSIC0 - "Sounds/Music/fantasy-forest-battle.ogg" // MENU_MUSIC + "Sounds/Music/forward-assault.ogg" // BOSS_MUSIC0 }; static Mix_Music* diff --git a/src/player.c b/src/player.c index 913d24a..f4ee913 100644 --- a/src/player.c +++ b/src/player.c @@ -42,7 +42,7 @@ #define ROGUE_STATS { 12, 12, 5, 7, 1, 2, 1, false, false } #define WARRIOR_STATS { 12, 12, 8, 9, 3, 1, 1, false, false } -static void +void player_levelup(Player *player) { mixer_play_effect(LEVEL_UP); diff --git a/src/player.h b/src/player.h index ecb6c54..e8af448 100644 --- a/src/player.h +++ b/src/player.h @@ -114,6 +114,9 @@ player_destroy(Player*); bool player_turn_over(Player*); +void +player_levelup(Player*); + Uint32 player_has_artifact(Player *, MagicalEffect);