Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d0b3ce1bd0 | |||
| 97a83b20f6 |
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+10
-2
@@ -449,6 +449,11 @@ 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_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_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_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 ====================================================================
|
// NOTE: Load sprite sheets ====================================================================
|
||||||
os->user_data = game;
|
os->user_data = game;
|
||||||
@@ -3020,6 +3025,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_splash_screen_shake_triggered = true;
|
||||||
game->play.perry_join_flash_alpha = 1.f;
|
game->play.perry_join_flash_alpha = 1.f;
|
||||||
game->play.perry_join_splash_screen_end_ms = game->play.clock_ms + 2000;
|
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 +4129,10 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
|
|||||||
if (new_player.yes) {
|
if (new_player.yes) {
|
||||||
if (new_player.tutorial_requested) {
|
if (new_player.tutorial_requested) {
|
||||||
game->play.state = FP_GameState_Tutorial;
|
game->play.state = FP_GameState_Tutorial;
|
||||||
|
TELY_Audio_Play(audio, game->audio[FP_GameAudio_GameStart], 1.f);
|
||||||
} else {
|
} else {
|
||||||
game->play.state = FP_GameState_Play;
|
game->play.state = FP_GameState_Play;
|
||||||
|
TELY_Audio_Play(audio, game->audio[FP_GameAudio_GameStart], 1.f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -4447,9 +4455,9 @@ void TELY_OS_DLLFrameUpdate(TELY_OS *os)
|
|||||||
|
|
||||||
TELY_Audio *audio = &os->audio;
|
TELY_Audio *audio = &os->audio;
|
||||||
|
|
||||||
#if 0
|
#if 1
|
||||||
if (audio->playback_size == 0) {
|
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
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -334,6 +334,11 @@ enum FP_GameAudio
|
|||||||
FP_GameAudio_Message,
|
FP_GameAudio_Message,
|
||||||
FP_GameAudio_Monkey,
|
FP_GameAudio_Monkey,
|
||||||
FP_GameAudio_PortalDestroy,
|
FP_GameAudio_PortalDestroy,
|
||||||
|
FP_GameAudio_GameStart,
|
||||||
|
FP_GameAudio_PerryStart,
|
||||||
|
FP_GameAudio_Ambience1,
|
||||||
|
FP_GameAudio_Ambience2,
|
||||||
|
FP_GameAudio_Music1,
|
||||||
FP_GameAudio_Count,
|
FP_GameAudio_Count,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user