- [FIX] No se cridava a SDL_Init()
- [FIX] Ja funciona el gamepad - [CHG] Canviat el format del temps en la pantalla de game over - [CHG] Canvi en una habitació per a balancejar
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "m_ingame.h"
|
||||
#include "jgame.h"
|
||||
#include "jinput.h"
|
||||
#include "controller.h"
|
||||
#include "jdraw.h"
|
||||
#include "actor.h"
|
||||
#include "room.h"
|
||||
@@ -69,12 +70,11 @@ namespace modules
|
||||
if (input::keyPressed(SDL_SCANCODE_ESCAPE)) {
|
||||
return INGAME_CONTINUAR;
|
||||
}
|
||||
if (input::keyPressed(SDL_SCANCODE_DOWN) || input::keyPressed(config::getKey(KEY_DOWN)))
|
||||
if (controller::pressed(KEY_DOWN))
|
||||
selected_option = (selected_option+1)&1;
|
||||
if (input::keyPressed(SDL_SCANCODE_UP) || input::keyPressed(config::getKey(KEY_UP)))
|
||||
if (controller::pressed(KEY_UP))
|
||||
selected_option = (selected_option-1)&1;
|
||||
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)) {
|
||||
return selected_option;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user