Fixes a mistake in music loading.

This commit is contained in:
Linus Probert 2018-08-14 16:59:49 +02:00
parent 6cc96a954d
commit 915ea59ca3
3 changed files with 6 additions and 3 deletions

View File

@ -28,11 +28,11 @@ static Mix_Music *current_song = NULL;
static Music loaded_song = LAST_MUSIC; static Music loaded_song = LAST_MUSIC;
static char *music[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/fantasy-game-background-looping.ogg", // GAME_MUSIC0
"Sounds/Music/bog-creatures-on-the-move-looping.ogg", // GAME_MUSIC1 "Sounds/Music/bog-creatures-on-the-move-looping.ogg", // GAME_MUSIC1
"Sounds/Music/fantascape-looping.ogg", // GAME_MUSIC2 "Sounds/Music/fantascape-looping.ogg", // GAME_MUSIC2
"Sounds/Music/forward-assault.ogg", // BOSS_MUSIC0 "Sounds/Music/forward-assault.ogg" // BOSS_MUSIC0
"Sounds/Music/fantasy-forest-battle.ogg" // MENU_MUSIC
}; };
static Mix_Music* static Mix_Music*

View File

@ -42,7 +42,7 @@
#define ROGUE_STATS { 12, 12, 5, 7, 1, 2, 1, false, false } #define ROGUE_STATS { 12, 12, 5, 7, 1, 2, 1, false, false }
#define WARRIOR_STATS { 12, 12, 8, 9, 3, 1, 1, false, false } #define WARRIOR_STATS { 12, 12, 8, 9, 3, 1, 1, false, false }
static void void
player_levelup(Player *player) player_levelup(Player *player)
{ {
mixer_play_effect(LEVEL_UP); mixer_play_effect(LEVEL_UP);

View File

@ -114,6 +114,9 @@ player_destroy(Player*);
bool bool
player_turn_over(Player*); player_turn_over(Player*);
void
player_levelup(Player*);
Uint32 Uint32
player_has_artifact(Player *, MagicalEffect); player_has_artifact(Player *, MagicalEffect);