Merge branch 'master' of https://gitea.sustancia.synology.me/JailDoctor/thepool
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "m_menu.h"
|
||||
#include "jgame.h"
|
||||
#include "jinput.h"
|
||||
#include "controller.h"
|
||||
#include "jdraw.h"
|
||||
#include "config.h"
|
||||
#include <SDL2/SDL.h>
|
||||
@@ -30,14 +31,13 @@ namespace modules
|
||||
if (input::keyPressed(SDL_SCANCODE_ESCAPE)) {
|
||||
return OPTION_EIXIR;
|
||||
}
|
||||
if (input::keyPressed(SDL_SCANCODE_DOWN) || input::keyPressed(config::getKey(KEY_DOWN)))
|
||||
if (controller::pressed(KEY_DOWN) || input::keyPressed(SDL_SCANCODE_DOWN))
|
||||
selected_option++; if (selected_option==5) selected_option=0;
|
||||
|
||||
if (input::keyPressed(SDL_SCANCODE_UP) || input::keyPressed(config::getKey(KEY_UP)))
|
||||
if (controller::pressed(KEY_UP) || input::keyPressed(SDL_SCANCODE_UP))
|
||||
selected_option--; if (selected_option<0) selected_option=4;
|
||||
|
||||
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) || input::keyPressed(SDL_SCANCODE_SPACE) ) {
|
||||
return selected_option;
|
||||
}
|
||||
|
||||
@@ -92,6 +92,8 @@ namespace modules
|
||||
|
||||
};
|
||||
|
||||
//draw::print2(input::getPadBtnPressed(), 3, 0, 24, RED, FONT_ZOOM_NONE);
|
||||
|
||||
draw::print2("(C) JAILDOCTOR 2024", 11, 28, TEAL, FONT_ZOOM_NONE);
|
||||
|
||||
draw::render();
|
||||
|
||||
Reference in New Issue
Block a user