From f9996cb800be544b64dd871d652eeb8c7870edf2 Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 28 May 2023 17:02:29 -0400 Subject: bubble sounds --- src/bullet.c | 4 ++++ src/player.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/bullet.c b/src/bullet.c index cfb12bf..c3015a6 100644 --- a/src/bullet.c +++ b/src/bullet.c @@ -6,6 +6,7 @@ #include "rodeo/collision.h" static rodeo_texture_2d_t bullet_texture; +static rodeo_audio_sound_t *pop_sound; //static rodeo_collision_2d_world_t bullet_collision_world; static rodeo_collision_2d_world_t player_bullet_collision_world = {0}; static rodeo_collision_2d_world_t enemy_bullet_collision_world = {0}; @@ -15,12 +16,14 @@ void init_bullets(void) { bullet_texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/bullet.png")); + pop_sound = rodeo_audio_sound_create_from_path(cstr_lit("assets/pop.wav")); } void deinit_bullets(void) { rodeo_texture_2d_destroy(&bullet_texture); + rodeo_audio_sound_destroy(pop_sound); } bullet_t * @@ -148,6 +151,7 @@ bullet_destroy( rodeo_collision_2d_world_item_destroy_by_id(bullet->id); *bullet = *cvec_bullet_t_back(&bullets); cvec_bullet_t_pop(&bullets); + rodeo_audio_sound_play(pop_sound); } void bullet_wall_resolver( diff --git a/src/player.c b/src/player.c index 5a8ba0f..1270ea3 100644 --- a/src/player.c +++ b/src/player.c @@ -29,6 +29,7 @@ struct player_t player = { 0 }; typedef struct player_t player_t; +static rodeo_audio_sound_t *bubbles_sound; // 0-19 jumping // 61 standing @@ -42,6 +43,7 @@ static float orc_size[] = {13.0f * 2.0f, 19.0f * 2.0f}; void init_player(void) { + bubbles_sound = rodeo_audio_sound_create_from_path(cstr_lit("assets/blowing_bubbles.wav")); player.texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/mainblob-128.png")); player.shadow_texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/blobshadow.png")); player.aim_texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/aim.png")); @@ -79,6 +81,7 @@ deinit_player(void) { rodeo_texture_2d_destroy(&player.texture); rodeo_collision_2d_world_destroy(&player_collision_world); + rodeo_audio_sound_destroy(bubbles_sound); } void @@ -150,6 +153,10 @@ move_player(void) { player.move_state = mv_state_standing; } + if(player.sprite.iter == 1) + { + rodeo_audio_sound_play(bubbles_sound); + } cvec_collision_2d_world_item_value *player_position = rodeo_collision_2d_world_item_get_by_id(player.collision_id); player_position->x += player_position->dx * ((60.0f - (float)player.sprite.iter) / 60.0f); player_position->dx = 0; -- cgit v1.2.3