Integrated the fixed configuration classes.

Author: Thumperrr

src/AppStateGame.cpp

@@ -5,7 +5,7 @@ namespace chesspp
     AppStateGame::AppStateGame( Application* _app, sf::RenderWindow *_display ) : app(_app), AppState(_display), graphics(display)
     {
         board = new Board();
-        board->newGame(configuration::instance().getBoardInitialLayout());
+        board->newGame(boardConfig.getInitialLayout());
     }
 
     int AppStateGame::id() { return 1; }

src/AppStateGame.h

@@ -18,7 +18,9 @@ namespace chesspp
     {
 	    Application* app;
         Board* board;
+
         graphics::GraphicsHandler graphics;
+        configuration::BoardConfig boardConfig;
 
     public:
         AppStateGame(Application* _app, sf::RenderWindow *_display);

src/Graphics.cpp

@@ -6,15 +6,18 @@ namespace chesspp
     {
 
 
-        GraphicsHandler::GraphicsHandler( sf::RenderWindow *_display ) 
-            : display(_display),
-            cell_size(configuration::instance().getCellWidth())
+        GraphicsHandler::GraphicsHandler( sf::RenderWindow *_display ) : display(_display)
         {
             try 
             {
-                board = sf::Sprite(TextureManager::getInstance().Load(configuration::instance().getSpritePath_board()));
-                pieces = sf::Sprite(TextureManager::getInstance().Load(configuration::instance().getSpritePath_pieces()));
-                validMove = sf::Sprite(TextureManager::getInstance().Load(configuration::instance().getSpritePath_validMove()));
+                configuration::BoardConfig boardConfig;
+                configuration::GraphicsConfig graphicsConfig;
+
+                board = sf::Sprite(TextureManager::getInstance().Load(graphicsConfig.getSpritePath_board()));
+                pieces = sf::Sprite(TextureManager::getInstance().Load(graphicsConfig.getSpritePath_pieces()));
+                validMove = sf::Sprite(TextureManager::getInstance().Load(graphicsConfig.getSpritePath_validMove()));
+
+                cell_size = boardConfig.getCellWidth();
             }
             catch (chesspp::exception &e) 
             {

src/Graphics.h

@@ -18,6 +18,9 @@ namespace chesspp
     {
         class GraphicsHandler
         {
+            sf::Sprite board, pieces, validMove;
+            uint16_t cell_size;
+            sf::RenderWindow *display;
 
         public:
             GraphicsHandler(sf::RenderWindow *_display);
@@ -39,12 +42,6 @@ namespace chesspp
 
             //Draws the entire game.
             void drawBoard(const Board *b);
-
-
-        private:
-            sf::Sprite board, pieces, validMove;
-            const int cell_size;
-            sf::RenderWindow *display;
         };
     }
 }