diff --git a/data/mus_ingame.ogg b/data/mus_ingame.ogg new file mode 100644 index 0000000..c7362b4 Binary files /dev/null and b/data/mus_ingame.ogg differ diff --git a/data/mus_menu.ogg b/data/mus_menu.ogg index c7362b4..d1340b9 100644 Binary files a/data/mus_menu.ogg and b/data/mus_menu.ogg differ diff --git a/source/actor.cpp b/source/actor.cpp index 7c8faa4..824767f 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -32,6 +32,7 @@ namespace actor bool floating_editing = false; int walk_channel = -1; + bool push_sound_already_playing = false; void resetTag() { @@ -819,7 +820,7 @@ namespace actor (hero::getSkills() & SKILL_SHOES) && (act->pos.y + act->size.y) <= max.y && act->pos.y >= min.y && (act->pos.x + act->size.x) <= max.x && act->pos.x >= min.x && act->react_mask == 0 && ((act->pos.z == 0 && room::getFloor() != 11) || (act->below || future_below))) { audio::pauseChannel(walk_channel); - audio::playSound("snd_jump.wav", SOUND_ALL); + audio::playSound("snd_jump.wav", SOUND_BASIC); // [RZC 01/10/2024] Hack per a que al aterrar sobre els que desapareixen puga botar sobre ells, i a més ells desapareguen if (!act->below && future_below && future_below->flags & FLAG_DISAPPEAR) actor::push(act, future_below, PUSH_ZN); @@ -868,7 +869,7 @@ namespace actor if (moving) { act->flags |= FLAG_ANIMATED; - if (act->react_mask==0 && ( (act->below) || (act->pos.z==0) )) audio::resumeChannel(walk_channel); + if ((config::getSoundMode()==SOUND_ALL) && act->react_mask==0 && ( (act->below) || (act->pos.z==0) )) audio::resumeChannel(walk_channel); } else { @@ -886,7 +887,11 @@ namespace actor void changeMoving(actor_t *act) { - audio::playSound("snd_push.wav", SOUND_BASIC); + if (!push_sound_already_playing) + { + audio::playSound("snd_push.wav", SOUND_BASIC); + push_sound_already_playing = true; + } switch (act->movement) { case MOV_X: @@ -1349,6 +1354,7 @@ namespace actor if (act == first) { + push_sound_already_playing = false; brilli_brilli = (brilli_brilli + 1) & 0x7; } diff --git a/source/m_game.cpp b/source/m_game.cpp index e456025..9285a21 100644 --- a/source/m_game.cpp +++ b/source/m_game.cpp @@ -42,7 +42,7 @@ namespace modules } fclose(f); } else { - audio::playMusic("ingame.ogg"); + audio::playMusic("mus_ingame.ogg"); } actor::hero::init();