Compare commits
2 Commits
8b155c9021
...
169170945b
Author | SHA1 | Date | |
---|---|---|---|
169170945b | |||
22c2c4096f |
BIN
Data/Audio/monkey.ogg
(Stored with Git LFS)
BIN
Data/Audio/monkey.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
Data/Audio/portal_destroy.ogg
(Stored with Git LFS)
BIN
Data/Audio/portal_destroy.ogg
(Stored with Git LFS)
Binary file not shown.
@ -516,6 +516,8 @@ void TELY_DLL_Init(void *user_data)
|
|||||||
game->audio[FP_GameAudio_MerchantGym] = platform->func_load_audio(assets, DQN_STRING8("Gym"), DQN_STRING8("Data/Audio/merchant_gym.ogg"));
|
game->audio[FP_GameAudio_MerchantGym] = platform->func_load_audio(assets, DQN_STRING8("Gym"), DQN_STRING8("Data/Audio/merchant_gym.ogg"));
|
||||||
game->audio[FP_GameAudio_MerchantPhone] = platform->func_load_audio(assets, DQN_STRING8("Phone"), DQN_STRING8("Data/Audio/merchant_tech.ogg"));
|
game->audio[FP_GameAudio_MerchantPhone] = platform->func_load_audio(assets, DQN_STRING8("Phone"), DQN_STRING8("Data/Audio/merchant_tech.ogg"));
|
||||||
game->audio[FP_GameAudio_Message] = platform->func_load_audio(assets, DQN_STRING8("Message"), DQN_STRING8("Data/Audio/message.ogg"));
|
game->audio[FP_GameAudio_Message] = platform->func_load_audio(assets, DQN_STRING8("Message"), DQN_STRING8("Data/Audio/message.ogg"));
|
||||||
|
game->audio[FP_GameAudio_Monkey] = platform->func_load_audio(assets, DQN_STRING8("Monkey"), DQN_STRING8("Data/Audio/monkey.ogg"));
|
||||||
|
game->audio[FP_GameAudio_PortalDestroy] = platform->func_load_audio(assets, DQN_STRING8("Portal Destroy"), DQN_STRING8("Data/Audio/portal_destroy.ogg"));
|
||||||
|
|
||||||
platform->user_data = game;
|
platform->user_data = game;
|
||||||
{
|
{
|
||||||
@ -634,6 +636,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
|
|||||||
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
|
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
|
||||||
entity->carried_monkey = closest_monkey.entity;
|
entity->carried_monkey = closest_monkey.entity;
|
||||||
picked_up_monkey_this_frame = true;
|
picked_up_monkey_this_frame = true;
|
||||||
|
TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -700,6 +703,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
|
|||||||
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
|
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
|
||||||
entity->carried_monkey = closest_monkey.entity;
|
entity->carried_monkey = closest_monkey.entity;
|
||||||
picked_up_monkey_this_frame = true;
|
picked_up_monkey_this_frame = true;
|
||||||
|
TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1295,6 +1299,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
|
|||||||
uint64_t duration_ms = FP_GAME_ENTITY_ACTION_INFINITE_TIMER;
|
uint64_t duration_ms = FP_GAME_ENTITY_ACTION_INFINITE_TIMER;
|
||||||
FP_Game_EntityActionReset(game, entity->handle, duration_ms, render_data.sprite);
|
FP_Game_EntityActionReset(game, entity->handle, duration_ms, render_data.sprite);
|
||||||
entity->action.sprite_play_once = true;
|
entity->action.sprite_play_once = true;
|
||||||
|
TELY_Audio_Play(audio, game->audio[FP_GameAudio_PortalDestroy], 1.f);
|
||||||
FP_Game_DeleteEntity(game, entity->carried_monkey);
|
FP_Game_DeleteEntity(game, entity->carried_monkey);
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
@ -274,6 +274,8 @@ enum FP_GameAudio
|
|||||||
FP_GameAudio_MerchantGym,
|
FP_GameAudio_MerchantGym,
|
||||||
FP_GameAudio_MerchantPhone,
|
FP_GameAudio_MerchantPhone,
|
||||||
FP_GameAudio_Message,
|
FP_GameAudio_Message,
|
||||||
|
FP_GameAudio_Monkey,
|
||||||
|
FP_GameAudio_PortalDestroy,
|
||||||
FP_GameAudio_Count,
|
FP_GameAudio_Count,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user