From a939bc266032f69df72f3ee515632f46310f1be1 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Fri, 19 Jun 2020 20:42:33 +0200 Subject: [PATCH] don't warn about nested main in key config --- Aquaria/AquariaMenuItem.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Aquaria/AquariaMenuItem.cpp b/Aquaria/AquariaMenuItem.cpp index 0ad89d7..043b0b0 100644 --- a/Aquaria/AquariaMenuItem.cpp +++ b/Aquaria/AquariaMenuItem.cpp @@ -713,7 +713,7 @@ void AquariaKeyConfig::onUpdate(float dt) 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; while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD) - dsq->run(0.1f); + dsq->run(0.1f, true); break; } } @@ -769,7 +769,7 @@ void AquariaKeyConfig::onUpdate(float dt) while (dsq->game->getKeyState(i)) { - dsq->run(0.1f); + dsq->run(0.1f, true); } toggleEnterKey(0); @@ -788,13 +788,13 @@ void AquariaKeyConfig::onUpdate(float dt) if (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; } else if(core->getKeyState(KEY_ESCAPE)) { while(core->getKeyState(KEY_ESCAPE)) - dsq->run(0.1f); + dsq->run(0.1f, true); abort = true; } else if(dsq->mouse.rawButtonMask) @@ -802,7 +802,7 @@ void AquariaKeyConfig::onUpdate(float dt) MouseButtons btns = dsq->mouse.buttons; while(dsq->mouse.rawButtonMask) - dsq->run(0.1f); + dsq->run(0.1f, true); if(btns.left) ac = MOUSE_BUTTON_LEFT; @@ -850,7 +850,7 @@ void AquariaKeyConfig::onUpdate(float dt) { abort = true; while(core->getKeyState(KEY_ESCAPE)) - dsq->run(0.1f); + dsq->run(0.1f, true); } else { @@ -862,7 +862,7 @@ void AquariaKeyConfig::onUpdate(float dt) { ac = JOY_BUTTON_0 + 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; } @@ -874,7 +874,7 @@ void AquariaKeyConfig::onUpdate(float dt) { ac = (ax < 0.0f ? JOY_AXIS_0_NEG : JOY_AXIS_0_POS) + i; while (fabsf(j->getAxisUncalibrated(i)) > JOY_AXIS_THRESHOLD) - dsq->run(0.1f); + dsq->run(0.1f, true); break; } }