From ecd098057f8ea17022b673731497138ad9ab6c48 Mon Sep 17 00:00:00 2001 From: przemek83 <4788832+przemek83@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:14:53 +0200 Subject: [PATCH] Move definitions to Display.cpp from Display.h. --- CMakeLists.txt | 1 + src/Display.cpp | 18 ++++++++++++++++++ src/Display.h | 21 +++++++-------------- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 src/Display.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fde9db6..e32aab2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ set(${PROJECT_NAME}_SOURCES src/MenuItem.cpp src/UserChoice.h src/Display.h + src/Display.cpp src/map/Water.cpp src/map/Water.h src/map/Steel.cpp diff --git a/src/Display.cpp b/src/Display.cpp new file mode 100644 index 0000000..ad82fef --- /dev/null +++ b/src/Display.cpp @@ -0,0 +1,18 @@ +#include "Display.h" + +#include "Config.h" + +Display::Display() + : width_(Config::getInstance().getBoardWidth() + + Config::getInstance().getSatusWidth()), + height_(Config::getInstance().getBoardHeight()) +{ +} + +int Display::getCenterX() const { return width_ / 2; } +int Display::getCenterY() const { return height_ / 2; } + +int Display::getWidth() const { return width_; } +void Display::setWidth(int width) { width_ = width; } +int Display::getHeight() const { return height_; } +void Display::setHeight(int height) { height_ = height; } \ No newline at end of file diff --git a/src/Display.h b/src/Display.h index 3ad9c16..0d25f63 100644 --- a/src/Display.h +++ b/src/Display.h @@ -1,26 +1,19 @@ #pragma once -#include "Config.h" - class Display { public: - Display() - : width_(Config::getInstance().getBoardWidth() + - Config::getInstance().getSatusWidth()), - height_(Config::getInstance().getBoardHeight()) - { - } + Display(); virtual ~Display() = default; - int getCenterX() const { return width_ / 2; } - int getCenterY() const { return height_ / 2; } + int getCenterX() const; + int getCenterY() const; - int getWidth() const { return width_; } - void setWidth(int width) { width_ = width; } - int getHeight() const { return height_; } - void setHeight(int height) { height_ = height; } + int getWidth() const; + void setWidth(int width); + int getHeight() const; + void setHeight(int height); private: int width_;