Moved graphics setup code into the graphics class.

1 files changed, 15 insertions, 8 deletions

diff --git a/src/graphics.h b/src/graphics.h
index 461bb45c..1d616611 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -67,13 +67,26 @@ public gcn::SDLGraphics {
         /**
          * Constructor.
          */
-        Graphics(SDL_Surface *screen);
+        Graphics();
 
         /**
          * Destructor.
          */
         ~Graphics();
 
+        /**
+         * Try to create a window with the given settings.
+         */
+        bool setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel);
+
+        /**
+         * Set fullscreen mode.
+         */
+        bool setFullscreen(bool fs);
+
+        void _beginDraw();
+        void _endDraw();
+
         void drawImage(Image *image, int x, int y);
         void drawImagePattern(Image *image, int x, int y, int w, int h);
 
@@ -113,13 +126,6 @@ public gcn::SDLGraphics {
          */
         int getHeight();
 
-        /**
-         * Sets a new screen pointer. This is necessary after switching screen
-         * modes, which probably should happen by this class instead of in the
-         * setup window.
-         */
-        void setScreen(SDL_Surface *screen);
-
         void setFont(gcn::ImageFont *font);
 
         void drawText(const std::string &text,
@@ -131,6 +137,7 @@ public gcn::SDLGraphics {
 
     private:
         SDL_Surface *mScreen;
+        bool mFullscreen, mHWAccel;
 };
 
 #endif