Submodule changes

feely_pona.cpp

@@ -449,6 +449,12 @@ void TELY_OS_DLLInit(TELY_OS *os)
     game->audio[FP_GameAudio_PortalDestroy] = os->funcs.load_audio(assets, DQN_STR8("Portal Destroy"),              DQN_STR8("Data/Audio/portal_destroy.ogg"));
     game->audio[FP_GameAudio_Smooch]        = os->funcs.load_audio(assets, DQN_STR8("Smooch"),                      DQN_STR8("Data/Audio/smooch.ogg"));
     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"));
+    game->audio[FP_GameAudio_Music2]        = os->funcs.load_audio(assets, DQN_STR8("Music two"),                   DQN_STR8("Data/Audio/music_2.ogg"));
 
     // NOTE: Load sprite sheets ====================================================================
     os->user_data = game;
@@ -2009,12 +2015,16 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audi
             // haven't given the player cooldown yet, so we assign a timestamp for that
             if (game->play.wave_cooldown_timestamp_ms == 0) {
                 game->play.wave_cooldown_timestamp_ms = game->play.clock_ms + FP_COOLDOWN_WAVE_TIME_MS;
+                TELY_Audio_Stop(audio, game->audio[FP_GameAudio_Music1]);
+                TELY_Audio_Play(audio, game->audio[FP_GameAudio_Music2], 1.f);
             } else {
                 // NOTE: Check if cooldown has elapsed, the next wave can start if so
                 if (game->play.clock_ms > game->play.wave_cooldown_timestamp_ms) {
                     game->play.enemies_per_wave           = DQN_MAX(5 * DQN_CAST(uint32_t)game->play.mob_spawners.size, DQN_CAST(uint32_t)(game->play.enemies_per_wave * 1.5));
                     game->play.enemies_spawned_this_wave  = 0; // Important! Reset the spawn count
                     game->play.wave_cooldown_timestamp_ms = 0; // Important! We reset the timestamp for the next wave
+                    TELY_Audio_Stop(audio, game->audio[FP_GameAudio_Music2]);
+                    TELY_Audio_Play(audio, game->audio[FP_GameAudio_Music1], 1.f);
 
                     if (monkey_spawn && game->play.current_wave != 0) {
                         // NOTE: We spawn a monkey at these wave intervals;
@@ -2031,6 +2041,7 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audi
                     }
 
                     game->play.current_wave++;
+                    //TELY_Audio_Stop(audio, game->audio[FP_GameAudio_Music2]);
 
                 }
             }
@@ -3020,6 +3031,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
                 game->play.perry_join_splash_screen_shake_triggered = true;
                 game->play.perry_join_flash_alpha                   = 1.f;
                 game->play.perry_join_splash_screen_end_ms          = game->play.clock_ms + 2000;
+                TELY_Audio_Play(audio, game->audio[FP_GameAudio_PerryStart], 1.f);
             }
         }
 
@@ -4123,8 +4135,10 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
             if (new_player.yes) {
                 if (new_player.tutorial_requested) {
                     game->play.state = FP_GameState_Tutorial;
+                    TELY_Audio_Play(audio, game->audio[FP_GameAudio_GameStart], 1.f);
                 } else {
                     game->play.state = FP_GameState_Play;
+                    TELY_Audio_Play(audio, game->audio[FP_GameAudio_GameStart], 1.f);
                 }
             }
         } else {
@@ -4447,9 +4461,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_Music2], 1.f /*volume*/);
     }
     #endif
 

feely_pona_game.h

@@ -334,6 +334,12 @@ enum FP_GameAudio
     FP_GameAudio_Message,
     FP_GameAudio_Monkey,
     FP_GameAudio_PortalDestroy,
+    FP_GameAudio_GameStart,
+    FP_GameAudio_PerryStart,
+    FP_GameAudio_Ambience1,
+    FP_GameAudio_Ambience2,
+    FP_GameAudio_Music1,
+    FP_GameAudio_Music2,
     FP_GameAudio_Count,
 };