From 97275533c26a2a9d4bf2f61077403425f251c650 Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Sat, 30 Oct 2021 08:48:21 +0300
Subject: [PATCH] some bugfixes

---
 CMakeLists.txt  | 22 ++++++++++++----------
 defConfigs.h    |  4 ++--
 gameManager.cpp |  2 +-
 tooltip.cpp     | 11 ++++++-----
 tooltip.h       |  1 -
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 590c3d9..64a1c3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.9)
 project(game)
 
 include_directories(/usr/include/irrlicht)
@@ -6,13 +6,15 @@ include_directories(/usr/include/irrlicht)
 link_directories(/usr/lib/)
 
 set(CMAKE_BUILD_TYPE Debug)
-set(states AbstractAppState.cpp ActiveGameState.cpp InGameAppState.cpp GuiAppState.cpp)
-set(util util.cpp)
-set(gui AbstractImage.cpp AbstractBitmapText.cpp Tooltip.cpp Button.cpp Listbox.cpp Textbox.cpp Checkbox.cpp Slider.cpp OptionsButton.cpp ExitButton.cpp ConsoleCommand.cpp)
-set(core EventListener.cpp GameManager.cpp main.cpp Key.cpp)
-set(content Player.cpp Vessel.cpp Destroyer.cpp Cruiser.cpp AircraftCarrier.cpp Submarine.cpp Unit.cpp Map.cpp GuidedMissile.cpp DepthCharge.cpp Jet.cpp DemoJet.cpp Missile.cpp MissileJet.cpp Projectile.cpp Shell.cpp Torpedo.cpp Explosion.cpp)
+cmake_policy(SET CMP0015 NEW)
 
-add_executable(game ${states} ${gui} ${core} ${content} ${util})
-target_link_libraries(game Irrlicht)
-target_link_libraries(game sfml-system)
-target_link_libraries(game sfml-audio)
+set(states abstractAppState.cpp activeGameState.cpp inGameAppState.cpp guiAppState.cpp)
+set(util util.cpp)
+set(gui abstractImage.cpp abstractBitmapText.cpp tooltip.cpp button.cpp listbox.cpp textbox.cpp checkbox.cpp slider.cpp optionsButton.cpp exitButton.cpp consoleCommand.cpp)
+set(core stateManager.cpp eventListener.cpp gameManager.cpp main.cpp key.cpp)
+set(content player.cpp vessel.cpp destroyer.cpp cruiser.cpp aircraftCarrier.cpp submarine.cpp unit.cpp map.cpp guidedMissile.cpp depthCharge.cpp jet.cpp demoJet.cpp missile.cpp missileJet.cpp projectile.cpp shell.cpp torpedo.cpp explosion.cpp)
+
+add_executable(battleship ${states} ${gui} ${core} ${content} ${util})
+target_link_libraries(battleship Irrlicht)
+target_link_libraries(battleship sfml-system)
+target_link_libraries(battleship sfml-audio)
diff --git a/defConfigs.h b/defConfigs.h
index 1e821b5..b9ea7b2 100755
--- a/defConfigs.h
+++ b/defConfigs.h
@@ -8,8 +8,8 @@
 
 namespace game{
     namespace core{
-        const irr::io::path PATH = "/home/dominykas/c++/Game/Assets/";
-        const std::string PATH_STR = "/home/dominykas/c++/Game/Assets/";
+        const irr::io::path PATH = "/home/dominykas/c++/Battleship/Assets/";
+        const std::string PATH_STR = "/home/dominykas/c++/Battleship/Assets/";
         const double camPanSpeed = .1;
         const irr::io::path DEFAULT_TEXTURE = PATH + "Textures/defaultTexture.jpg";
 
diff --git a/gameManager.cpp b/gameManager.cpp
index be00d08..0b2cd91 100755
--- a/gameManager.cpp
+++ b/gameManager.cpp
@@ -24,7 +24,7 @@ namespace game{
 				}
 
         GameManager::GameManager() {
-    				IrrlichtDevice *device = createDevice(video::EDT_OPENGL, irr::core::dimension2d<u32>(800,600), 32, false, true, true, nullptr);
+    				device = createDevice(video::EDT_OPENGL, irr::core::dimension2d<u32>(800,600), 32, false, true, true, nullptr);
     				device->setResizable(true);
 						irr::video::IVideoDriver *driver = device->getVideoDriver();
 						irr::scene::ISceneManager *smgr = device->getSceneManager();
diff --git a/tooltip.cpp b/tooltip.cpp
index be02989..ca8fb5a 100644
--- a/tooltip.cpp
+++ b/tooltip.cpp
@@ -7,17 +7,18 @@ namespace game{
         using namespace game::core;
         
         Tooltip::Tooltip(vector2di pos, stringw entry){
-            this->pos=pos;
-            text=new BitmapText(entry,pos,GameManager::getSingleton()->getDevice()->getGUIEnvironment()->getFont(PATH + "Fonts/fontcourier.bmp"));
-            gameManager->attachBitmapText(text);
+            this->pos = pos;
+						GameManager *gm = GameManager::getSingleton();
+            text=new BitmapText(entry,pos,gm->getDevice()->getGUIEnvironment()->getFont(PATH + "Fonts/fontcourier.bmp"));
+            gm->attachBitmapText(text);
         }
         
         Tooltip::~Tooltip(){
-            gameManager->detachBitmapText(text);
+						GameManager::getSingleton()->detachBitmapText(text);
         }
         
         void Tooltip::update(){
-            IVideoDriver *driver=gameManager->getDevice()->getVideoDriver();
+            IVideoDriver *driver=GameManager::getSingleton()->getDevice()->getVideoDriver();
             dimension2d<u32> dim=text->getFont()->getDimension(text->getText().c_str());
             driver->draw2DRectangle(SColor(255,0,0,0),recti(pos.X,pos.Y,pos.X+dim.Width,pos.Y+dim.Height),nullptr);
             driver->draw2DRectangleOutline(recti(pos-vector2di(1,1),dimension2df(dim.Width+1,dim.Height+1)),SColor(255,255,0,0));
diff --git a/tooltip.h b/tooltip.h
index 1d95798..db312ee 100644
--- a/tooltip.h
+++ b/tooltip.h
@@ -11,7 +11,6 @@ namespace game{
             ~Tooltip();
             void update();
         private:
-            core::GameManager *gameManager;
             irr::core::vector2di pos;
             BitmapText *text;
         };