From adc8813e0d279065f2bc85d964712cfb88c8a4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20A=2E=20Ortega=20Froysa?= Date: Mon, 17 Dec 2018 18:53:20 +0100 Subject: [PATCH] Removed unnecessary GameWorld --- CMakeLists.txt | 3 +-- src/GameWorld.hpp | 26 -------------------------- src/System.hpp | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 src/GameWorld.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c1bd80..2c137d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,7 @@ set(SRCS "src/Main.cpp" "src/Model.cpp" "src/Shader.cpp" - "src/System.cpp" - "src/GameLogic.cpp") + "src/System.cpp") # Define C++ compiler flags set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -Wpedantic -Wfatal-errors -Werror -pedantic-errors -fno-elide-constructors") diff --git a/src/GameWorld.hpp b/src/GameWorld.hpp deleted file mode 100644 index 9bb9ba7..0000000 --- a/src/GameWorld.hpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2018 Ortega Froysa, Nicolás - * Author: Ortega Froysa, Nicolás - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#pragma once - -class GameWorld { -public: - GameWorld(); - -private: -}; diff --git a/src/System.hpp b/src/System.hpp index e4d9c6f..b56f37a 100644 --- a/src/System.hpp +++ b/src/System.hpp @@ -27,7 +27,6 @@ #include #include #include "Camera.hpp" -#include "GameLogic.hpp" class System { public: System(); @@ -48,7 +47,6 @@ private: std::map shaders; Camera cam; bool running; - GameLogic board_ctrl; int CheckWin(); void handleKey(SDL_Keysym key); };