#include "supertux/globals.hpp"
#include "supertux/menu/menu_storage.hpp"
#include "supertux/timer.hpp"
+#include "util/gettext.hpp"
#include "util/log.hpp"
#include "video/drawing_context.hpp"
MenuManager::MenuManager() :
m_dialog(),
+ m_has_next_dialog(false),
+ m_next_dialog(),
m_menu_stack(),
m_transition(new MenuTransition)
{
void
MenuManager::draw(DrawingContext& context)
{
+ if (m_has_next_dialog)
+ {
+ m_dialog = std::move(m_next_dialog);
+ m_has_next_dialog = false;
+ }
+
if (m_transition->is_active())
{
m_transition->update();
{
if (m_dialog)
{
+ m_dialog->update();
m_dialog->draw(context);
}
else if (current_menu())
void
MenuManager::set_dialog(std::unique_ptr<Dialog> dialog)
{
- m_dialog = std::move(dialog);
+ // delay reseting m_dialog to a later point, as otherwise the Dialog
+ // can't unset itself without ending up with "delete this" problems
+ m_next_dialog = std::move(dialog);
+ m_has_next_dialog = true;
}
void