diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset_defs.c | 3 | ||||
| -rw-r--r-- | src/audio.c | 5 | ||||
| -rw-r--r-- | src/rounds.c | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c index 6bf6718..f53c5ea 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -69,6 +69,9 @@ void load_assets() { wav_round_change = Mix_LoadWAV("data/sounds/round_change.wav"); wav_character = Mix_LoadWAV("data/sounds/character.wav"); wav_step = Mix_LoadWAV("data/sounds/step.wav"); + + // music + music_inside1 = Mix_LoadMUS("data/sounds/music_inside1.mp3"); } font* get_font(platform_window* window, float scale) { diff --git a/src/audio.c b/src/audio.c index f741570..696b9ec 100644 --- a/src/audio.c +++ b/src/audio.c @@ -132,6 +132,11 @@ void audio_channel_finished(int channel) { audio_channel_usage[channel] = false; } +void play_music(Mix_Music* music) { + Mix_FadeInMusic(music, -1, 2000); + Mix_VolumeMusic(MIX_MAX_VOLUME/4); +} + void play_positioned_sound(int channel, Mix_Chunk* wav, vec3f pos, float max_audible_dist) { player* p = get_player_by_id(player_id); if (!p) return; diff --git a/src/rounds.c b/src/rounds.c index 88166c6..f5082a4 100644 --- a/src/rounds.c +++ b/src/rounds.c @@ -100,7 +100,6 @@ void update_round_server() if (characters_visible_count > round_text_len) characters_visible_count = round_text_len; if (visible_previously_count < characters_visible_count) { add_ui_audio_event_to_queue(EVENT_CHARACTER_TYPE); - log_info("CHARACTER!"); visible_previously_count = characters_visible_count; } } |