Modified GraphicsHandler and AppStateGame to use Configuration, instead of declaring hardcoded paths.

Author: Thumperrr

src/AppStateGame.cpp

@@ -1,15 +1,11 @@
 #include "AppState.h"
 
-const std::string FILEPATH = "C:/Users/Steve/Documents/Visual Studio 2012/Projects/ChessPlusPlus/";
-
 namespace chesspp
 {
     AppStateGame::AppStateGame( Application* _app, sf::RenderWindow *_display ) : app(_app), AppState(_display), graphics(display)
     {
-
-        std::string gamePath(FILEPATH + "res/games/new_game.txt");
         board = new Board();
-        board->newGame(gamePath);
+        board->newGame(configuration::instance().getBoardInitialLayout());
     }
 
     int AppStateGame::id() { return 1; }

src/AppStateGame.h

@@ -3,6 +3,7 @@
 #include "SFML.hpp"
 #include "TextureManager.h"
 #include "Graphics.h"
+#include "Configuration.h"
 #include "board/Board.h"
 
 #ifdef _DEBUG

src/Graphics.cpp

@@ -6,17 +6,16 @@ namespace chesspp
     {
 
 
-        GraphicsHandler::GraphicsHandler( sf::RenderWindow *_display ) : display(_display), 
-            backgroundPath(file_path + "res/img/chessboard_640x640.png"), // Hardcoded. Will change in the future.
-            piecePath(file_path + "res/img/chess_pieces_80x80_each.png"), //
-            validMovePath(file_path + "res/img/valid_move.png")           //
+        GraphicsHandler::GraphicsHandler( sf::RenderWindow *_display ) 
+            : display(_display),
+            cell_size(configuration::instance().getCellWidth())
         {
             try 
             {
-                board = sf::Sprite(TextureManager::getInstance().Load(backgroundPath));
-                pieces = sf::Sprite(TextureManager::getInstance().Load(piecePath));
-                validMove = sf::Sprite(TextureManager::getInstance().Load(validMovePath));
-            } 
+                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()));
+            }
             catch (chesspp::exception &e) 
             {
 #ifdef _DEBUG

src/Graphics.h

@@ -3,6 +3,7 @@
 
 #include "SFML.hpp"
 #include "TextureManager.h"
+#include "Configuration.h"
 #include "board/Piece.h"
 #include "board/logger.h"
 
@@ -15,11 +16,6 @@ namespace chesspp
 {
     namespace graphics
     {
-        const std::string file_path = "C:/Users/Steve/Documents/Visual Studio 2012/Projects/ChessPlusPlus/";
-        const int cell_size = 80; 
-        const int board_width = 8;
-        const int board_height = 0; //Working on a game configuration interface so these don't have to be hard coded.
-
         class GraphicsHandler
         {
 
@@ -47,7 +43,7 @@ namespace chesspp
 
         private:
             sf::Sprite board, pieces, validMove;
-            std::string backgroundPath, piecePath, validMovePath;
+            const int cell_size;
             sf::RenderWindow *display;
         };
     }