Fixed use of Enter for closing death and weight notices, and changed glColor4f

to glColor4ub.

3 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index fd0408ac..0089f0ae 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -29,14 +29,14 @@
 #include "windowcontainer.h"
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
-        gcn::ActionListener *listener):
+                   gcn::ActionListener *listener):
     Window(title, true)
 {
     init(msg, listener);
 }
 
 OkDialog::OkDialog(Window *parent, const std::string &title,
-        const std::string &msg, gcn::ActionListener *listener):
+                   const std::string &msg, gcn::ActionListener *listener):
     Window(title, true, parent)
 {
     init(msg, listener);
@@ -56,9 +56,8 @@ void OkDialog::init(const std::string &msg, gcn::ActionListener *listener)
 
     setContentSize(w, h);
     userLabel->setPosition(10, 10);
-    okButton->setPosition(
-            (w - okButton->getWidth()) / 2,
-            h - 5 - okButton->getHeight());
+    okButton->setPosition((w - okButton->getWidth()) / 2,
+                          h - 5 - okButton->getHeight());
 
     okButton->setEventId("ok");
     okButton->addActionListener(this);
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 6dcf1e6a..3dfc18c8 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -43,7 +43,7 @@ class OkDialog : public Window, public gcn::ActionListener {
          * @see Window::Window
          */
         OkDialog(const std::string &title, const std::string &msg,
-                gcn::ActionListener *listener = NULL);
+                 gcn::ActionListener *listener = NULL);
 
         /**
          * Constructor with parent reference.
@@ -51,8 +51,8 @@ class OkDialog : public Window, public gcn::ActionListener {
          * @see Window::Window
          */
         OkDialog(Window *window, const std::string &title,
-                const std::string &msg,
-                gcn::ActionListener *listener = NULL);
+                 const std::string &msg,
+                 gcn::ActionListener *listener = NULL);
 
         /**
          * Destructor.
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index acb23cd4..642b891f 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -161,15 +161,16 @@ void Window::setWindowContainer(WindowContainer *wc)
 
 void Window::draw(gcn::Graphics* graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, getWidth(), getHeight(),
-                                         border);
+    Graphics *g = (Graphics*)graphics;
+
+    g->drawImageRect(0, 0, getWidth(), getHeight(), border);
 
     // Draw grip
     if (resizable)
     {
-        dynamic_cast<Graphics*>(graphics)->drawImage(Window::resizeGrip,
-                                                     getWidth() - resizeGrip->getWidth(),
-                                                     getHeight() - resizeGrip->getHeight());
+        g->drawImage(Window::resizeGrip,
+                     getWidth() - resizeGrip->getWidth(),
+                     getHeight() - resizeGrip->getHeight());
     }
 
     // Draw title