mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-09 15:49:52 +00:00
Code Issues Releases Wiki Activity

whoops

Browse source
This commit is contained in:
fgenesis 2016-07-10 01:11:06 +02:00
parent 2efc227ad9
commit 082dcacad8
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/DSQ.cpp
View file

@ -274,7 +274,7 @@ void DSQ::rumble(float leftMotor, float rightMotor, float time)
{ {
//if (this->inputMode == INPUT_JOYSTICK) //if (this->inputMode == INPUT_JOYSTICK)
// core->joystick.rumble(leftMotor, rightMotor, time); // core->joystick.rumble(leftMotor, rightMotor, time);
assert(false); // FIXME //assert(false); // FIXME
} }
void DSQ::newGame() void DSQ::newGame()

4
Aquaria/InGameMenu.cpp
View file

@ -966,7 +966,7 @@ void InGameMenu::action(int id, int state, int source)
} }
} }
if(id == ACTION_ESC) if(id == ACTION_ESC && !state)
{ {
if (isInGameMenu()) if (isInGameMenu())
{ {
@ -3864,6 +3864,8 @@ void InGameMenu::updateOptionsMenu(float dt)
void InGameMenu::update(float dt) void InGameMenu::update(float dt)
{ {
ActionMapper::onUpdate(dt);
if (menuSelectDelay > 0) if (menuSelectDelay > 0)
{ {
menuSelectDelay -= dt; menuSelectDelay -= dt;