ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call onUpdate before drawing is started.

Browse Source 
No idea why it's in render() function, especially that some dialogs are self-destroyed in onUpdate.

It may need some testing if everything is ok.
This commit is contained in:
Deve 2019-06-13 19:17:25 +02:00
parent c8099cd11d
commit 8c4ace6c17
1 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/guiengine/engine.cpp
View File

@ -1188,12 +1188,37 @@ namespace GUIEngine
ul.unlock();
#endif
const GameState gamestate = g_state_manager->getGameState();
// ---- some menus may need updating
bool dialog_opened = false;
if (ScreenKeyboard::isActive())
{
ScreenKeyboard::getCurrent()->onUpdate(dt);
dialog_opened = true;
}
else if (ModalDialog::isADialogActive())
{
ModalDialog::getCurrent()->onUpdate(dt);
dialog_opened = true;
}
if (gamestate != GAME || is_loading)
{
Screen* screen = getCurrentScreen();
if (screen != NULL &&
(!dialog_opened || screen->getUpdateInBackground()))
{
screen->onUpdate(elapsed_time);
}
}
// ---- menu drawing
// draw background image and sections
const GameState gamestate = g_state_manager->getGameState();
if ( (gamestate == MENU &&
GUIEngine::getCurrentScreen() != NULL &&
!GUIEngine::getCurrentScreen()->needs3D() ) || is_loading)
@ -1216,45 +1241,10 @@ namespace GUIEngine
// further render)
g_env->drawAll();
// ---- some menus may need updating
if (gamestate != GAME || is_loading)
if (gamestate == GAME && !is_loading && !dialog_opened)
{
bool dialog_opened = false;
if (ScreenKeyboard::isActive())
{
ScreenKeyboard::getCurrent()->onUpdate(dt);
dialog_opened = true;
}
else if (ModalDialog::isADialogActive())
{
ModalDialog::getCurrent()->onUpdate(dt);
dialog_opened = true;
}
Screen* screen = getCurrentScreen();
if (screen != NULL &&
(!dialog_opened || screen->getUpdateInBackground()))
{
screen->onUpdate(elapsed_time);
}
}
else
{
if (ScreenKeyboard::isActive())
{
ScreenKeyboard::getCurrent()->onUpdate(dt);
}
else if (ModalDialog::isADialogActive())
{
ModalDialog::getCurrent()->onUpdate(dt);
}
else
{
RaceGUIBase* rg = World::getWorld()->getRaceGUI();
if (rg != NULL) rg->renderGlobal(elapsed_time);
}
RaceGUIBase* rg = World::getWorld()->getRaceGUI();
if (rg != NULL) rg->renderGlobal(elapsed_time);
}
MessageQueue::update(elapsed_time);