Moved window size into graphics.conf

Author: Databean

resources/graphics.conf

@@ -2,6 +2,10 @@
 font.path=resources/ComicNeue-Bold.ttf
 font.size=50
 
+# General window settings
+screen.width=900
+screen.height=800
+
 # Trading view screen coordinates
 screen.tradingView.bottomLeft=(0.1,0.1)
 screen.tradingView.topRight=(0.9,0.9)

src/GameView.cpp

@@ -154,7 +154,7 @@ bool GameView::acceptInput(SDL_Event& event) {
 	if(event.type == SDL_QUIT) {
 		return false;
 	} else if(event.type == SDL_MOUSEBUTTONUP) {
-		ScreenCoordinate screen = {(float) event.button.x / 900.f, 1.f - (float) event.button.y / 800.f};
+		ScreenCoordinate screen = {(float) event.button.x / getGraphicsConfig()["screen.width"], 1.f - (float) event.button.y / getGraphicsConfig()["screen.height"]};
 		for(auto& it : viewElements) {
 			if(it.second->handleClick(screen)) {
 				//break;

src/main.cpp

@@ -13,6 +13,7 @@
 #include <vector>
 #include <memory>
 
+#include "Config.h"
 #include "GameBoard.h"
 #include "Player.h"
 #include "GameView.h"
@@ -50,7 +51,6 @@ void updateViewport(int width, int height) {
  * Main. Initializes SDL and the model, view, and controller. Also has the main game loop.
  */
 int main(int argc, char *argv[]) {
-	const int windowWidth = 900, windowHeight = 800;
 
 	if(TTF_Init()==-1) {
 		std::cout << "Error in TTF_Init: " << TTF_GetError() << std::endl;
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
 	SDL_Window* displayWindow;
 	SDL_Renderer* displayRenderer;
 	SDL_RendererInfo displayRendererInfo;
-	SDL_CreateWindowAndRenderer(windowWidth, windowHeight, SDL_WINDOW_OPENGL, &displayWindow, &displayRenderer);
+	SDL_CreateWindowAndRenderer(getGraphicsConfig()["screen.width"], getGraphicsConfig()["screen.height"], SDL_WINDOW_OPENGL, &displayWindow, &displayRenderer);
 	SDL_GetRendererInfo(displayRenderer, &displayRendererInfo);
 	/*TODO: Check that we have OpenGL */
 	if ((displayRendererInfo.flags & SDL_RENDERER_ACCELERATED) == 0 || 
@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
 
 	initOpenGL();
 
-	updateViewport(windowWidth, windowHeight);
+	updateViewport(getGraphicsConfig()["screen.width"], getGraphicsConfig()["screen.height"]);
 
 	GameBoard model({"Player1", "Player2", "Player3", "Player4"});
 	GameView view(model);