JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'master' of https://gitea.sustancia.synology.me/JailDoctor/thepool

Browse Source
This commit is contained in:
Raimon Zamora
2024-10-03 13:16:04 +02:00
parent e009aef341 1f6956ad81
commit b44ba3517a
15 changed files with 85 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/m_menu_audio.cpp
View File

@@ -1,6 +1,7 @@
#include "m_menu_audio.h"
#include "jgame.h"
#include "jinput.h"
#include "controller.h"
#include "jdraw.h"
#include "jaudio.h"
#include <SDL2/SDL.h>
@@ -22,18 +23,17 @@ namespace modules
if (input::keyPressed(SDL_SCANCODE_ESCAPE)) {
return MENU_AUDIO_TORNAR;
}
if (input::keyPressed(SDL_SCANCODE_DOWN) || input::keyPressed(config::getKey(KEY_DOWN)))
if (controller::pressed(KEY_DOWN))
{
selected_option = (selected_option==2)?0:selected_option+1;
audio::playSound("snd_push.wav", SOUND_BASIC);
}
if (input::keyPressed(SDL_SCANCODE_UP) || input::keyPressed(config::getKey(KEY_UP)))
if (controller::pressed(KEY_UP))
{
selected_option = (selected_option==0)?2:selected_option-1;
audio::playSound("snd_push.wav", SOUND_BASIC);
}
if (input::keyPressed(SDL_SCANCODE_SPACE) || input::keyPressed(SDL_SCANCODE_RETURN) ||
input::keyPressed(config::getKey(KEY_JUMP)) || input::keyPressed(config::getKey(KEY_PICK))) {
if (controller::pressed(KEY_JUMP) || controller::pressed(KEY_PICK)) {
if (selected_option==MENU_AUDIO_MUSICA) {
config::toggleMusic();
if (config::isMusicEnabled())