*possible* fix for bugs #453 and #373

Menu is updated in mainloop so it won't stay open (because noone updates it)

SVN-Revision: 5892

diff --git a/src/game_session.cpp b/src/game_session.cpp
index a5f0076..09dcf5a 100644 (file)
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -396,8 +396,6 @@ GameSession::process_menu()
 {
   Menu* menu = Menu::current();
   if(menu) {
-    menu->update();
-
     if(menu == game_menu.get()) {
       switch (game_menu->check()) {
         case MNID_CONTINUE:

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index cc062a0..e544e5f 100644 (file)
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -603,8 +603,11 @@ Menu::update()
 int
 Menu::check()
 {
-  if (hit_item != -1)
-    return items[hit_item]->id;
+  if (hit_item != -1) {
+    int id = items[hit_item]->id;
+    hit_item = -1;                     //Clear event when checked out.. (we would end up in a loop when we try to leave "fake" submenu like Addons or Contrib)
+    return id;
+  }
   else
     return -1;
 }

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 4b99735..e613666 100644 (file)
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -167,6 +167,8 @@ MainLoop::update_gamelogic(float elapsed_time)
   Scripting::update_debugger();
   Scripting::TimeScheduler::instance->update(game_time);
   current_screen->update(elapsed_time);
+  if (Menu::current() != NULL)
+       Menu::current()->update();
   if(screen_fade.get() != NULL)
     screen_fade->update(elapsed_time);
   Console::instance->update(elapsed_time);

diff --git a/src/title.cpp b/src/title.cpp
index a187aea..2f0b7c0 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -418,8 +418,6 @@ TitleScreen::update(float elapsed_time)
 
   Menu* menu = Menu::current();
   if(menu) {
-    menu->update();
-
     if(menu == main_menu.get()) {
       switch (main_menu->check()) {
         case MNID_STARTGAME:

diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
index f01a0c1..94856d1 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -577,8 +577,6 @@ WorldMap::update(float delta)
   if(!in_level) {
     Menu* menu = Menu::current();
     if(menu != NULL) {
-      menu->update();
-
       if(menu == worldmap_menu.get()) {
         switch (worldmap_menu->check())
         {