Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/
[supertux.git] / src / gui / menu.cpp
index e544e5f..6c2970a 100644 (file)
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <ctype.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <iostream>
-#include <sstream>
 #include <math.h>
-#include <cstdlib>
-#include <cstdio>
-#include <string>
-#include <cassert>
-#include <stdexcept>
-
-#include "menu.hpp"
-#include "mainloop.hpp"
-#include "video/drawing_context.hpp"
-#include "gettext.hpp"
-#include "math/vector.hpp"
-#include "main.hpp"
-#include "resources.hpp"
-#include "timer.hpp"
+
 #include "control/joystickkeyboardcontroller.hpp"
+#include "gui/menu.hpp"
+#include "supertux/main.hpp"
+#include "supertux/mainloop.hpp"
+#include "supertux/resources.hpp"
+#include "supertux/timer.hpp"
+#include "util/gettext.hpp"
+#include "video/drawing_context.hpp"
 
 static const float MENU_REPEAT_INITIAL = 0.4f;
 static const float MENU_REPEAT_RATE    = 0.1f;
 static const float FLICK_CURSOR_TIME   = 0.5f;
 
-extern SDL_Surface* screen;
+extern SDL_Surface* g_screen;
 
 std::vector<Menu*> Menu::last_menus;
 std::list<Menu*> Menu::all_menus;
@@ -69,47 +53,47 @@ bool confirm_dialog(Surface *background, std::string text)
 
   // TODO make this a screen and not another mainloop...
   while(true)
-    {
-      SDL_Event event;
-      while (SDL_PollEvent(&event)) {
-        if(event.type == SDL_QUIT)
-          main_loop->quit();
-        main_controller->process_event(event);
-        dialog->event(event);
-      }
-
-      if(background == NULL)
-        context.draw_gradient(Color(0.8f, 0.95f, 0.85f), Color(0.8f, 0.8f, 0.8f),
-                              LAYER_BACKGROUND0);
-      else
-        context.draw_surface(background, Vector(0,0), LAYER_BACKGROUND0);
+  {
+    SDL_Event event;
+    while (SDL_PollEvent(&event)) {
+      if(event.type == SDL_QUIT)
+        g_main_loop->quit();
+      g_main_controller->process_event(event);
+      dialog->event(event);
+    }
 
-      dialog->draw(context);
-      dialog->update();
+    if(background == NULL)
+      context.draw_gradient(Color(0.8f, 0.95f, 0.85f), Color(0.8f, 0.8f, 0.8f),
+                            LAYER_BACKGROUND0);
+    else
+      context.draw_surface(background, Vector(0,0), LAYER_BACKGROUND0);
 
-      switch (dialog->check())
-        {
-        case true:
-          //delete cap_screen;
-          Menu::set_current(0);
-          delete dialog;
-          return true;
-          break;
-        case false:
-          //delete cap_screen;
-          Menu::set_current(0);
-          delete dialog;
-          return false;
-          break;
-        default:
-          break;
-        }
+    dialog->draw(context);
+    dialog->update();
 
-      mouse_cursor->draw(context);
-      context.do_drawing();
-      SDL_Delay(25);
+    switch (dialog->check())
+    {
+      case true:
+        //delete cap_screen;
+        Menu::set_current(0);
+        delete dialog;
+        return true;
+        break;
+      case false:
+        //delete cap_screen;
+        Menu::set_current(0);
+        delete dialog;
+        return false;
+        break;
+      default:
+        break;
     }
 
+    mouse_cursor->draw(context);
+    context.do_drawing();
+    SDL_Delay(25);
+  }
+
   return false;
 }
 
@@ -155,14 +139,14 @@ Menu::set_current(Menu* menu)
     current_ = menu;
   }
   else if (current_) {
-    last_menus.clear();                                //NULL new menu pointer => close all menus
+    last_menus.clear();                         //NULL new menu pointer => close all menus
     current_->effect_start_time = real_time;
     current_->effect_progress = 0.0f;
     current_->close = true;
   }
 
   // just to be sure...
-  main_controller->reset();
+  g_main_controller->reset();
 }
 
 void
@@ -172,10 +156,10 @@ Menu::recalc_pos()
     current_->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2);
 
   for(std::list<Menu*>::iterator i = all_menus.begin(); i != all_menus.end(); ++i)
-    {
-      // FIXME: This is of course not quite right, since it ignores any previous set_pos() calls
-      (*i)->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2);
-    }
+  {
+    // FIXME: This is of course not quite right, since it ignores any previous set_pos() calls
+    (*i)->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2);
+  }
 }
 
 MenuItem::MenuItem(MenuItemKind _kind, int _id)
@@ -204,10 +188,10 @@ MenuItem::set_help(const std::string& help_text)
   std::string overflow;
   help = normal_font->wrap_to_width(help_text, 600, &overflow);
   while (!overflow.empty())
-    {
-      help += "\n";
-      help += normal_font->wrap_to_width(overflow, 600, &overflow);
-    }
+  {
+    help += "\n";
+    help += normal_font->wrap_to_width(overflow, 600, &overflow);
+  }
 }
 
 std::string MenuItem::get_input_with_symbol(bool active_item)
@@ -245,7 +229,7 @@ Menu::~Menu()
 }
 
 Menu::Menu()
-    : close(false)
+  : close(false)
 {
   all_menus.push_back(this);
 
@@ -313,11 +297,11 @@ Menu::add_label(const std::string& text)
 
 MenuItem*
 Menu::add_controlfield(int id, const std::string& text,
-                const std::string& mapping)
+                       const std::string& mapping)
 {
   MenuItem* item = new MenuItem(MN_CONTROLFIELD, id);
   item->change_text(text);
-        item->change_input(mapping);
+  item->change_input(mapping);
   additem(item);
   return item;
 }
@@ -395,10 +379,10 @@ Menu::update()
 {
   int menu_height = (int) get_height();
   if (menu_height > SCREEN_HEIGHT)
-    { // Scrolling
-      int scroll_offset = (menu_height - SCREEN_HEIGHT) / 2 + 32;
-      pos_y = SCREEN_HEIGHT/2 - scroll_offset * ((float(active_item) / (items.size()-1)) - 0.5f) * 2.0f;
-    }
+  { // Scrolling
+    int scroll_offset = (menu_height - SCREEN_HEIGHT) / 2 + 32;
+    pos_y = SCREEN_HEIGHT/2 - scroll_offset * ((float(active_item) / (items.size()-1)) - 0.5f) * 2.0f;
+  }
 
   effect_progress = (real_time - effect_start_time) * 6.0f;
 
@@ -415,51 +399,51 @@ Menu::update()
   }
 
   /** check main input controller... */
-  if(main_controller->pressed(Controller::UP)) {
+  if(g_main_controller->pressed(Controller::UP)) {
     menuaction = MENU_ACTION_UP;
     menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
   }
-  if(main_controller->hold(Controller::UP) &&
-      menu_repeat_time != 0 && real_time > menu_repeat_time) {
+  if(g_main_controller->hold(Controller::UP) &&
+     menu_repeat_time != 0 && real_time > menu_repeat_time) {
     menuaction = MENU_ACTION_UP;
     menu_repeat_time = real_time + MENU_REPEAT_RATE;
   }
 
-  if(main_controller->pressed(Controller::DOWN)) {
+  if(g_main_controller->pressed(Controller::DOWN)) {
     menuaction = MENU_ACTION_DOWN;
     menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
   }
-  if(main_controller->hold(Controller::DOWN) &&
-      menu_repeat_time != 0 && real_time > menu_repeat_time) {
+  if(g_main_controller->hold(Controller::DOWN) &&
+     menu_repeat_time != 0 && real_time > menu_repeat_time) {
     menuaction = MENU_ACTION_DOWN;
     menu_repeat_time = real_time + MENU_REPEAT_RATE;
   }
 
-  if(main_controller->pressed(Controller::LEFT)) {
+  if(g_main_controller->pressed(Controller::LEFT)) {
     menuaction = MENU_ACTION_LEFT;
     menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
   }
-  if(main_controller->hold(Controller::LEFT) &&
-      menu_repeat_time != 0 && real_time > menu_repeat_time) {
+  if(g_main_controller->hold(Controller::LEFT) &&
+     menu_repeat_time != 0 && real_time > menu_repeat_time) {
     menuaction = MENU_ACTION_LEFT;
     menu_repeat_time = real_time + MENU_REPEAT_RATE;
   }
 
-  if(main_controller->pressed(Controller::RIGHT)) {
+  if(g_main_controller->pressed(Controller::RIGHT)) {
     menuaction = MENU_ACTION_RIGHT;
     menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
   }
-  if(main_controller->hold(Controller::RIGHT) &&
-      menu_repeat_time != 0 && real_time > menu_repeat_time) {
+  if(g_main_controller->hold(Controller::RIGHT) &&
+     menu_repeat_time != 0 && real_time > menu_repeat_time) {
     menuaction = MENU_ACTION_RIGHT;
     menu_repeat_time = real_time + MENU_REPEAT_RATE;
   }
 
-  if(main_controller->pressed(Controller::ACTION)
-     || main_controller->pressed(Controller::MENU_SELECT)) {
+  if(g_main_controller->pressed(Controller::ACTION)
+     || g_main_controller->pressed(Controller::MENU_SELECT)) {
     menuaction = MENU_ACTION_HIT;
   }
-  if(main_controller->pressed(Controller::PAUSE_MENU)) {
+  if(g_main_controller->pressed(Controller::PAUSE_MENU)) {
     menuaction = MENU_ACTION_BACK;
   }
 
@@ -540,7 +524,7 @@ Menu::update()
 
         case MN_STRINGSELECT:
           if(items[active_item]->selected+1 < items[active_item]->list.size())
-              items[active_item]->selected++;
+            items[active_item]->selected++;
           else
             items[active_item]->selected = 0;
 
@@ -605,7 +589,7 @@ Menu::check()
 {
   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)
+    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
@@ -643,131 +627,131 @@ Menu::draw_item(DrawingContext& context, int index)
     x_pos += 24 - menu_width/2 + (text_width + input_width + list_width)/2;
 
   if(index == active_item)
-    {
-      shadow_size = 3;
-      text_color = active_color;
-    }
+  {
+    shadow_size = 3;
+    text_color = active_color;
+  }
 
   if(active_item == index)
-    {
-      float blink = (sinf(real_time * M_PI * 1.0f)/2.0f + 0.5f) * 0.5f + 0.25f;
-      context.draw_filled_rect(Rect(Vector(pos_x - menu_width/2 + 10 - 2, y_pos - 12 - 2),
-                                    Vector(pos_x + menu_width/2 - 10 + 2, y_pos + 12 + 2)),
-                               Color(1.0f, 1.0f, 1.0f, blink),
-                               14.0f,
-                               LAYER_GUI-10);
-      context.draw_filled_rect(Rect(Vector(pos_x - menu_width/2 + 10, y_pos - 12),
-                                    Vector(pos_x + menu_width/2 - 10, y_pos + 12)),
-                               Color(1.0f, 1.0f, 1.0f, 0.5f),
-                               12.0f,
-                               LAYER_GUI-10);
-    }
+  {
+    float blink = (sinf(real_time * M_PI * 1.0f)/2.0f + 0.5f) * 0.5f + 0.25f;
+    context.draw_filled_rect(Rect(Vector(pos_x - menu_width/2 + 10 - 2, y_pos - 12 - 2),
+                                  Vector(pos_x + menu_width/2 - 10 + 2, y_pos + 12 + 2)),
+                             Color(1.0f, 1.0f, 1.0f, blink),
+                             14.0f,
+                             LAYER_GUI-10);
+    context.draw_filled_rect(Rect(Vector(pos_x - menu_width/2 + 10, y_pos - 12),
+                                  Vector(pos_x + menu_width/2 - 10, y_pos + 12)),
+                             Color(1.0f, 1.0f, 1.0f, 0.5f),
+                             12.0f,
+                             LAYER_GUI-10);
+  }
 
   switch (pitem.kind)
-    {
+  {
     case MN_INACTIVE:
-      {
-        context.draw_text(normal_font, pitem.text,
-                          Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
-                          ALIGN_CENTER, LAYER_GUI, inactive_color);
-        break;
-      }
+    {
+      context.draw_text(normal_font, pitem.text,
+                        Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
+                        ALIGN_CENTER, LAYER_GUI, inactive_color);
+      break;
+    }
 
     case MN_HL:
-      {
-        // TODO
-        float x = pos_x - menu_width/2;
-        float y = y_pos - 12;
-        /* Draw a horizontal line with a little 3d effect */
-        context.draw_filled_rect(Vector(x, y + 6),
-                                 Vector(menu_width, 4),
-                                 Color(0.6f, 0.7f, 1.0f, 1.0f), LAYER_GUI);
-        context.draw_filled_rect(Vector(x, y + 6),
-                                 Vector(menu_width, 2),
-                                 Color(1.0f, 1.0f, 1.0f, 1.0f), LAYER_GUI);
-        break;
-      }
+    {
+      // TODO
+      float x = pos_x - menu_width/2;
+      float y = y_pos - 12;
+      /* Draw a horizontal line with a little 3d effect */
+      context.draw_filled_rect(Vector(x, y + 6),
+                               Vector(menu_width, 4),
+                               Color(0.6f, 0.7f, 1.0f, 1.0f), LAYER_GUI);
+      context.draw_filled_rect(Vector(x, y + 6),
+                               Vector(menu_width, 2),
+                               Color(1.0f, 1.0f, 1.0f, 1.0f), LAYER_GUI);
+      break;
+    }
     case MN_LABEL:
-      {
-        context.draw_text(big_font, pitem.text,
-                          Vector(pos_x, y_pos - int(big_font->get_height()/2)),
-                          ALIGN_CENTER, LAYER_GUI, label_color);
-        break;
-      }
+    {
+      context.draw_text(big_font, pitem.text,
+                        Vector(pos_x, y_pos - int(big_font->get_height()/2)),
+                        ALIGN_CENTER, LAYER_GUI, label_color);
+      break;
+    }
     case MN_TEXTFIELD:
     case MN_NUMFIELD:
     case MN_CONTROLFIELD:
+    {
+      if(pitem.kind == MN_TEXTFIELD || pitem.kind == MN_NUMFIELD)
       {
-        if(pitem.kind == MN_TEXTFIELD || pitem.kind == MN_NUMFIELD)
-          {
-            if(active_item == index)
-              context.draw_text(normal_font,
-                                pitem.get_input_with_symbol(true),
-                                Vector(right, y_pos - int(normal_font->get_height()/2)),
-                                ALIGN_RIGHT, LAYER_GUI, field_color);
-            else
-              context.draw_text(normal_font,
-                                pitem.get_input_with_symbol(false),
-                                Vector(right, y_pos - int(normal_font->get_height()/2)),
-                                ALIGN_RIGHT, LAYER_GUI, field_color);
-          }
+        if(active_item == index)
+          context.draw_text(normal_font,
+                            pitem.get_input_with_symbol(true),
+                            Vector(right, y_pos - int(normal_font->get_height()/2)),
+                            ALIGN_RIGHT, LAYER_GUI, field_color);
         else
-          context.draw_text(normal_font, pitem.input,
+          context.draw_text(normal_font,
+                            pitem.get_input_with_symbol(false),
                             Vector(right, y_pos - int(normal_font->get_height()/2)),
                             ALIGN_RIGHT, LAYER_GUI, field_color);
-
-        context.draw_text(normal_font, pitem.text,
-                          Vector(left, y_pos - int(normal_font->get_height()/2)),
-                          ALIGN_LEFT, LAYER_GUI, text_color);
-        break;
       }
+      else
+        context.draw_text(normal_font, pitem.input,
+                          Vector(right, y_pos - int(normal_font->get_height()/2)),
+                          ALIGN_RIGHT, LAYER_GUI, field_color);
+
+      context.draw_text(normal_font, pitem.text,
+                        Vector(left, y_pos - int(normal_font->get_height()/2)),
+                        ALIGN_LEFT, LAYER_GUI, text_color);
+      break;
+    }
     case MN_STRINGSELECT:
-      {
-        float roff = arrow_left->get_width();
-        // Draw left side
-        context.draw_text(normal_font, pitem.text,
-                          Vector(left, y_pos - int(normal_font->get_height()/2)),
-                          ALIGN_LEFT, LAYER_GUI, text_color);
-
-        // Draw right side
-        context.draw_surface(arrow_left.get(),
-                             Vector(right - list_width - roff - roff, y_pos - 8),
-                             LAYER_GUI);
-        context.draw_surface(arrow_right.get(),
-                             Vector(right - roff, y_pos - 8),
-                             LAYER_GUI);
-        context.draw_text(normal_font, pitem.list[pitem.selected],
-                          Vector(right - roff, y_pos - int(normal_font->get_height()/2)),
-                          ALIGN_RIGHT, LAYER_GUI, text_color);
-        break;
-      }
+    {
+      float roff = arrow_left->get_width();
+      // Draw left side
+      context.draw_text(normal_font, pitem.text,
+                        Vector(left, y_pos - int(normal_font->get_height()/2)),
+                        ALIGN_LEFT, LAYER_GUI, text_color);
+
+      // Draw right side
+      context.draw_surface(arrow_left.get(),
+                           Vector(right - list_width - roff - roff, y_pos - 8),
+                           LAYER_GUI);
+      context.draw_surface(arrow_right.get(),
+                           Vector(right - roff, y_pos - 8),
+                           LAYER_GUI);
+      context.draw_text(normal_font, pitem.list[pitem.selected],
+                        Vector(right - roff, y_pos - int(normal_font->get_height()/2)),
+                        ALIGN_RIGHT, LAYER_GUI, text_color);
+      break;
+    }
     case MN_BACK:
-      {
-        context.draw_text(normal_font, pitem.text,
-                          Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
-                          ALIGN_CENTER, LAYER_GUI, text_color);
-        context.draw_surface(back.get(),
-                             Vector(x_pos + text_width/2  + 16, y_pos - 8),
-                             LAYER_GUI);
-        break;
-      }
+    {
+      context.draw_text(normal_font, pitem.text,
+                        Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
+                        ALIGN_CENTER, LAYER_GUI, text_color);
+      context.draw_surface(back.get(),
+                           Vector(x_pos + text_width/2  + 16, y_pos - 8),
+                           LAYER_GUI);
+      break;
+    }
 
     case MN_TOGGLE:
-      {
-        context.draw_text(normal_font, pitem.text,
-                          Vector(pos_x - menu_width/2 + 16, y_pos - (normal_font->get_height()/2)),
-                          ALIGN_LEFT, LAYER_GUI, text_color);
-
-        if(pitem.toggled)
-          context.draw_surface(checkbox_checked.get(),
-                               Vector(x_pos + (menu_width/2-16) - checkbox->get_width(), y_pos - 8),
-                               LAYER_GUI + 1);
-        else
-          context.draw_surface(checkbox.get(),
-                               Vector(x_pos + (menu_width/2-16) - checkbox->get_width(), y_pos - 8),
-                               LAYER_GUI + 1);
-        break;
-      }
+    {
+      context.draw_text(normal_font, pitem.text,
+                        Vector(pos_x - menu_width/2 + 16, y_pos - (normal_font->get_height()/2)),
+                        ALIGN_LEFT, LAYER_GUI, text_color);
+
+      if(pitem.toggled)
+        context.draw_surface(checkbox_checked.get(),
+                             Vector(x_pos + (menu_width/2-16) - checkbox->get_width(), y_pos - 8),
+                             LAYER_GUI + 1);
+      else
+        context.draw_surface(checkbox.get(),
+                             Vector(x_pos + (menu_width/2-16) - checkbox->get_width(), y_pos - 8),
+                             LAYER_GUI + 1);
+      break;
+    }
     case MN_ACTION:
       context.draw_text(normal_font, pitem.text,
                         Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
@@ -779,7 +763,7 @@ Menu::draw_item(DrawingContext& context, int index)
                         Vector(pos_x, y_pos - int(normal_font->get_height()/2)),
                         ALIGN_CENTER, LAYER_GUI, text_color);
       break;
-    }
+  }
 }
 
 float
@@ -795,7 +779,7 @@ Menu::get_width() const
       font = big_font;
 
     float w = font->get_text_width(items[i]->text) +
-        big_font->get_text_width(items[i]->input) + 16;
+      big_font->get_text_width(items[i]->input) + 16;
     if(items[i]->kind == MN_TOGGLE)
       w += 32;
 
@@ -824,24 +808,24 @@ Menu::draw(DrawingContext& context)
   float menu_height = get_height();
 
   if (effect_progress != 1.0f)
+  {
+    if (close)
     {
-      if (close)
-        {
-          menu_width  = (current_->get_width()  * (1.0f - effect_progress));
-          menu_height = (current_->get_height() * (1.0f - effect_progress));
-        }
-      else if (Menu::previous)
-        {
-          menu_width  = (menu_width  * effect_progress) + (Menu::previous->get_width()  * (1.0f - effect_progress));
-          menu_height = (menu_height * effect_progress) + (Menu::previous->get_height() * (1.0f - effect_progress));
-          //std::cout << effect_progress << " " << this << " " << last_menus.back() << std::endl;
-        }
-      else
-        {
-          menu_width  *= effect_progress;
-          menu_height *= effect_progress;
-        }
+      menu_width  = (current_->get_width()  * (1.0f - effect_progress));
+      menu_height = (current_->get_height() * (1.0f - effect_progress));
+    }
+    else if (Menu::previous)
+    {
+      menu_width  = (menu_width  * effect_progress) + (Menu::previous->get_width()  * (1.0f - effect_progress));
+      menu_height = (menu_height * effect_progress) + (Menu::previous->get_height() * (1.0f - effect_progress));
+      //std::cout << effect_progress << " " << this << " " << last_menus.back() << std::endl;
+    }
+    else
+    {
+      menu_width  *= effect_progress;
+      menu_height *= effect_progress;
     }
+  }
 
   /* Draw a transparent background */
   context.draw_filled_rect(Rect(Vector(pos_x - menu_width/2-4, pos_y - menu_height/2 - 10-4),
@@ -857,36 +841,36 @@ Menu::draw(DrawingContext& context)
                            LAYER_GUI-10);
 
   if (!items[active_item]->help.empty())
-    {
-      int text_width  = (int) normal_font->get_text_width(items[active_item]->help);
-      int text_height = (int) normal_font->get_text_height(items[active_item]->help);
+  {
+    int text_width  = (int) normal_font->get_text_width(items[active_item]->help);
+    int text_height = (int) normal_font->get_text_height(items[active_item]->help);
       
-      Rect text_rect(pos_x - text_width/2 - 8, 
-                     SCREEN_HEIGHT - 48 - text_height/2 - 4,
-                     pos_x + text_width/2 + 8, 
-                     SCREEN_HEIGHT - 48 + text_height/2 + 4);
+    Rect text_rect(pos_x - text_width/2 - 8, 
+                   SCREEN_HEIGHT - 48 - text_height/2 - 4,
+                   pos_x + text_width/2 + 8, 
+                   SCREEN_HEIGHT - 48 + text_height/2 + 4);
         
-      context.draw_filled_rect(Rect(text_rect.p1 - Vector(4,4),
-                                    text_rect.p2 + Vector(4,4)),
-                               Color(0.2f, 0.3f, 0.4f, 0.8f), 
-                               16.0f,
-                               LAYER_GUI-10);
+    context.draw_filled_rect(Rect(text_rect.p1 - Vector(4,4),
+                                  text_rect.p2 + Vector(4,4)),
+                             Color(0.2f, 0.3f, 0.4f, 0.8f), 
+                             16.0f,
+                             LAYER_GUI-10);
       
-      context.draw_filled_rect(text_rect,
-                               Color(0.6f, 0.7f, 0.8f, 0.5f), 
-                               16.0f,
-                               LAYER_GUI-10);
-
-      context.draw_text(normal_font, items[active_item]->help,
-                        Vector(pos_x, SCREEN_HEIGHT - 48 - text_height/2),
-                        ALIGN_CENTER, LAYER_GUI);
-    }
+    context.draw_filled_rect(text_rect,
+                             Color(0.6f, 0.7f, 0.8f, 0.5f), 
+                             16.0f,
+                             LAYER_GUI-10);
+
+    context.draw_text(normal_font, items[active_item]->help,
+                      Vector(pos_x, SCREEN_HEIGHT - 48 - text_height/2),
+                      ALIGN_CENTER, LAYER_GUI);
+  }
 
   if (effect_progress == 1.0f)
     for(unsigned int i = 0; i < items.size(); ++i)
-      {
-        draw_item(context, i);
-      }
+    {
+      draw_item(context, i);
+    }
 }
 
 MenuItem&
@@ -952,53 +936,53 @@ Menu::event(const SDL_Event& event)
 
   switch(event.type) {
     case SDL_MOUSEBUTTONDOWN:
-      {
-        int x = int(event.motion.x * float(SCREEN_WIDTH)/screen->w);
-        int y = int(event.motion.y * float(SCREEN_HEIGHT)/screen->h);
+    {
+      int x = int(event.motion.x * float(SCREEN_WIDTH)/g_screen->w);
+      int y = int(event.motion.y * float(SCREEN_HEIGHT)/g_screen->h);
 
-        if(x > pos_x - get_width()/2 &&
-            x < pos_x + get_width()/2 &&
-            y > pos_y - get_height()/2 &&
-            y < pos_y + get_height()/2)
-          {
-            menuaction = MENU_ACTION_HIT;
-          }
+      if(x > pos_x - get_width()/2 &&
+         x < pos_x + get_width()/2 &&
+         y > pos_y - get_height()/2 &&
+         y < pos_y + get_height()/2)
+      {
+        menuaction = MENU_ACTION_HIT;
       }
-      break;
+    }
+    break;
 
     case SDL_MOUSEMOTION:
-      {
-        float x = event.motion.x * SCREEN_WIDTH/screen->w;
-        float y = event.motion.y * SCREEN_HEIGHT/screen->h;
+    {
+      float x = event.motion.x * SCREEN_WIDTH/g_screen->w;
+      float y = event.motion.y * SCREEN_HEIGHT/g_screen->h;
 
-        if(x > pos_x - get_width()/2 &&
-            x < pos_x + get_width()/2 &&
-            y > pos_y - get_height()/2 &&
-            y < pos_y + get_height()/2)
-          {
-            int new_active_item
-              = static_cast<int> ((y - (pos_y - get_height()/2)) / 24);
+      if(x > pos_x - get_width()/2 &&
+         x < pos_x + get_width()/2 &&
+         y > pos_y - get_height()/2 &&
+         y < pos_y + get_height()/2)
+      {
+        int new_active_item
+          = static_cast<int> ((y - (pos_y - get_height()/2)) / 24);
 
-            /* only change the mouse focus to a selectable item */
-            if ((items[new_active_item]->kind != MN_HL)
-                && (items[new_active_item]->kind != MN_LABEL)
-                && (items[new_active_item]->kind != MN_INACTIVE))
-              active_item = new_active_item;
+        /* only change the mouse focus to a selectable item */
+        if ((items[new_active_item]->kind != MN_HL)
+            && (items[new_active_item]->kind != MN_LABEL)
+            && (items[new_active_item]->kind != MN_INACTIVE))
+          active_item = new_active_item;
 
-            if(MouseCursor::current())
-              MouseCursor::current()->set_state(MC_LINK);
-          }
-        else
-        {
-          if(MouseCursor::current())
-            MouseCursor::current()->set_state(MC_NORMAL);
-        }
+        if(MouseCursor::current())
+          MouseCursor::current()->set_state(MC_LINK);
       }
-      break;
+      else
+      {
+        if(MouseCursor::current())
+          MouseCursor::current()->set_state(MC_NORMAL);
+      }
+    }
+    break;
 
     default:
       break;
-    }
+  }
 }
 
 void
@@ -1012,3 +996,5 @@ Menu::set_active_item(int id)
     }
   }
 }
+
+/* EOF */