mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-03 18:14:01 +00:00
Code Issues Releases Wiki Activity

don't warn about nested main in key config

Browse source
This commit is contained in:
fgenesis 2020-06-19 20:42:33 +02:00
parent 988db94b72
commit a939bc2660
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Aquaria/AquariaMenuItem.cpp
View file

@ -713,7 +713,7 @@ void AquariaKeyConfig::onUpdate(float dt)
while (dsq->game->getKeyState(i)) while (dsq->game->getKeyState(i))
{ {
dsq->run(0.1f); dsq->run(0.1f, true);
} }
} }
} }
@ -729,7 +729,7 @@ void AquariaKeyConfig::onUpdate(float dt)
{ {
ac = i; ac = i;
while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD) while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD)
dsq->run(0.1f); dsq->run(0.1f, true);
break; break;
} }
} }
@ -769,7 +769,7 @@ void AquariaKeyConfig::onUpdate(float dt)
while (dsq->game->getKeyState(i)) while (dsq->game->getKeyState(i))
{ {
dsq->run(0.1f); dsq->run(0.1f, true);
} }
toggleEnterKey(0); toggleEnterKey(0);
@ -788,13 +788,13 @@ void AquariaKeyConfig::onUpdate(float dt)
if (core->getKeyState(KEY_DELETE) || core->getKeyState(KEY_BACKSPACE)) if (core->getKeyState(KEY_DELETE) || core->getKeyState(KEY_BACKSPACE))
{ {
while(core->getKeyState(KEY_DELETE) || core->getKeyState(KEY_BACKSPACE)) while(core->getKeyState(KEY_DELETE) || core->getKeyState(KEY_BACKSPACE))
dsq->run(0.1f); dsq->run(0.1f, true);
clear = true; clear = true;
} }
else if(core->getKeyState(KEY_ESCAPE)) else if(core->getKeyState(KEY_ESCAPE))
{ {
while(core->getKeyState(KEY_ESCAPE)) while(core->getKeyState(KEY_ESCAPE))
dsq->run(0.1f); dsq->run(0.1f, true);
abort = true; abort = true;
} }
else if(dsq->mouse.rawButtonMask) else if(dsq->mouse.rawButtonMask)
@ -802,7 +802,7 @@ void AquariaKeyConfig::onUpdate(float dt)
MouseButtons btns = dsq->mouse.buttons; MouseButtons btns = dsq->mouse.buttons;
while(dsq->mouse.rawButtonMask) while(dsq->mouse.rawButtonMask)
dsq->run(0.1f); dsq->run(0.1f, true);
if(btns.left) if(btns.left)
ac = MOUSE_BUTTON_LEFT; ac = MOUSE_BUTTON_LEFT;
@ -850,7 +850,7 @@ void AquariaKeyConfig::onUpdate(float dt)
{ {
abort = true; abort = true;
while(core->getKeyState(KEY_ESCAPE)) while(core->getKeyState(KEY_ESCAPE))
dsq->run(0.1f); dsq->run(0.1f, true);
} }
else else
{ {
@ -862,7 +862,7 @@ void AquariaKeyConfig::onUpdate(float dt)
{ {
ac = JOY_BUTTON_0 + i; ac = JOY_BUTTON_0 + i;
while (j->getButton(i)) while (j->getButton(i))
dsq->run(0.1f); dsq->run(0.1f, true); // skip recursion check; we're already in the menu so this would always warn
break; break;
} }
@ -874,7 +874,7 @@ void AquariaKeyConfig::onUpdate(float dt)
{ {
ac = (ax < 0.0f ? JOY_AXIS_0_NEG : JOY_AXIS_0_POS) + i; ac = (ax < 0.0f ? JOY_AXIS_0_NEG : JOY_AXIS_0_POS) + i;
while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD) while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD)
dsq->run(0.1f); dsq->run(0.1f, true);
break; break;
} }
} }