Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 15 insertions, 13 deletions

diff --git a/src/graphics.h b/src/graphics.h
index 4a695a7a..172032dc 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -46,14 +46,16 @@ struct SDL_Surface;
  * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
  * repeated to fit the size of the widget.
  */
-struct ImageRect {
+struct ImageRect
+{
     Image *grid[9];
 };
 
 /**
  * A central point of control for graphics.
  */
-class Graphics : public gcn::SDLGraphics {
+class Graphics : public gcn::SDLGraphics
+{
     public:
         /**
          * Constructor.
@@ -95,17 +97,15 @@ class Graphics : public gcn::SDLGraphics {
          * @return <code>true</code> if the image was blitted properly
          *         <code>false</code> otherwise.
          */
-        virtual bool
-        drawImage(Image *image,
-                  int srcX, int srcY,
-                  int dstX, int dstY,
-                  int width, int height,
-                  bool useColor = false);
-
-        virtual void
-        drawImagePattern(Image *image,
-                         int x, int y,
-                         int w, int h);
+        virtual bool drawImage(Image *image,
+                               int srcX, int srcY,
+                               int dstX, int dstY,
+                               int width, int height,
+                               bool useColor = false);
+
+        virtual void drawImagePattern(Image *image,
+                                      int x, int y,
+                                      int w, int h);
 
         /**
          * Draws a rectangle using images. 4 corner images, 4 side images and 1
@@ -153,4 +153,6 @@ class Graphics : public gcn::SDLGraphics {
         bool mFullscreen, mHWAccel;
 };
 
+extern Graphics *graphics;
+
 #endif