From d0b3ce1bd0a48a072be30ea4782ac7e60915af1a Mon Sep 17 00:00:00 2001 From: Joshalosh Date: Thu, 9 Nov 2023 08:37:08 +1100 Subject: [PATCH] fp: Add potential ambience and background music options --- Data/Audio/ambience_1.ogg | 3 +++ Data/Audio/ambience_2.ogg | 3 +++ Data/Audio/music_1.ogg | 3 +++ feely_pona.cpp | 7 +++++-- feely_pona_game.h | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Data/Audio/ambience_1.ogg create mode 100644 Data/Audio/ambience_2.ogg create mode 100644 Data/Audio/music_1.ogg diff --git a/Data/Audio/ambience_1.ogg b/Data/Audio/ambience_1.ogg new file mode 100644 index 0000000..fdcd850 --- /dev/null +++ b/Data/Audio/ambience_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdfbf5d88d630dc42977b5be8b44c6319d716b7e3b84f82f5f7e2d7a4cbec7d6 +size 2064118 diff --git a/Data/Audio/ambience_2.ogg b/Data/Audio/ambience_2.ogg new file mode 100644 index 0000000..6355105 --- /dev/null +++ b/Data/Audio/ambience_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c12fca75d486f890e9988850f6cb74557a77a279c0485d24726833956bfaff21 +size 4024996 diff --git a/Data/Audio/music_1.ogg b/Data/Audio/music_1.ogg new file mode 100644 index 0000000..5f5cc59 --- /dev/null +++ b/Data/Audio/music_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8aeab80763b9af04c3b3df4714d7a3b0cdad63598a54b96673810db4ca053097 +size 2445751 diff --git a/feely_pona.cpp b/feely_pona.cpp index b11e1aa..6956b0c 100644 --- a/feely_pona.cpp +++ b/feely_pona.cpp @@ -451,6 +451,9 @@ void TELY_OS_DLLInit(TELY_OS *os) game->audio[FP_GameAudio_Woosh] = os->funcs.load_audio(assets, DQN_STR8("Woosh"), DQN_STR8("Data/Audio/woosh.ogg")); game->audio[FP_GameAudio_GameStart] = os->funcs.load_audio(assets, DQN_STR8("Game Start"), DQN_STR8("Data/Audio/game_start.ogg")); game->audio[FP_GameAudio_PerryStart] = os->funcs.load_audio(assets, DQN_STR8("Perry Start"), DQN_STR8("Data/Audio/perry_start.ogg")); + game->audio[FP_GameAudio_Ambience1] = os->funcs.load_audio(assets, DQN_STR8("Ambience one"), DQN_STR8("Data/Audio/ambience_1.ogg")); + game->audio[FP_GameAudio_Ambience2] = os->funcs.load_audio(assets, DQN_STR8("Ambience two"), DQN_STR8("Data/Audio/ambience_2.ogg")); + game->audio[FP_GameAudio_Music1] = os->funcs.load_audio(assets, DQN_STR8("Music one"), DQN_STR8("Data/Audio/music_1.ogg")); // NOTE: Load sprite sheets ==================================================================== os->user_data = game; @@ -4452,9 +4455,9 @@ void TELY_OS_DLLFrameUpdate(TELY_OS *os) TELY_Audio *audio = &os->audio; - #if 0 + #if 1 if (audio->playback_size == 0) { - TELY_Audio_Play(audio, game->audio[FP_GameAudio_TestAudio], 1.f /*volume*/); + TELY_Audio_Play(audio, game->audio[FP_GameAudio_Ambience2], 1.f /*volume*/); } #endif diff --git a/feely_pona_game.h b/feely_pona_game.h index 5f43105..0d23276 100644 --- a/feely_pona_game.h +++ b/feely_pona_game.h @@ -336,6 +336,9 @@ enum FP_GameAudio FP_GameAudio_PortalDestroy, FP_GameAudio_GameStart, FP_GameAudio_PerryStart, + FP_GameAudio_Ambience1, + FP_GameAudio_Ambience2, + FP_GameAudio_Music1, FP_GameAudio_Count, };