Merge pull request #144 from Longwater1234/dev

Author: Longwater1234

CMakeLists.txt

@@ -14,11 +14,13 @@ endif()
 # ==== UPDATE ME HERE ===========
 # Absolute path where you installed SFML (Required on Windows)
 set(SFML_HOME "C:/SFML/SFML-2.6.1")
+# ==========================
 
+# Collect all sources
 file(GLOB_RECURSE GAME_SRC "src/*.cpp" "src/*.hpp")  
-set(SFML_DIR ${SFML_HOME}/lib/cmake/SFML) 
+set(SFML_DIR ${SFML_HOME}/lib/cmake/SFML)  
 
-find_package(SFML 2.6 REQUIRED COMPONENTS "graphics" "window" "system")
+find_package(SFML 2.6 REQUIRED COMPONENTS "graphics" "window" "system") 
 
 # download extra libs  
 add_subdirectory(dependencies)   
@@ -31,7 +33,7 @@ elseif(APPLE)
   find_library(FOUNDATION_FRAMEWORK Foundation)
   target_link_libraries(SpaceCheckers PRIVATE ${FOUNDATION_FRAMEWORK})
 else() 
-  add_executable(SpaceCheckers ${GAME_SRC})    
+  add_executable(SpaceCheckers ${GAME_SRC})     
 endif()   
 
 # link all required libraries 
@@ -43,14 +45,14 @@ include_directories(${SFML_HOME}/include)
 
 # show warnings (depending on C++ compiler)
 if(MSVC)
-  target_compile_options(SpaceCheckers PRIVATE /W4 /sdl)
+  target_compile_options(SpaceCheckers PRIVATE /W4 /sdl /Qvec-report:1)
 else()  
   target_compile_options(SpaceCheckers PRIVATE -Wall) 
 endif()
 
 # COPY resources folder to destination
 if(NOT APPLE)
-  add_custom_command(
+  add_custom_command( 
     TARGET SpaceCheckers 
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/resources

dependencies/libcpr.cmake

@@ -1,4 +1,4 @@
-# add libcpr (HTTP Client) v1.10.5
+# add libcpr (HTTP Client) v1.11.1
 
 SET(SSL_OPTION "CPR_FORCE_OPENSSL_BACKEND TRUE")
 if(WIN32)
@@ -9,8 +9,8 @@ endif()
 
 CPMAddPackage(
     NAME cpr
-    URL    "https://github.com/libcpr/cpr/archive/refs/tags/1.10.5.tar.gz"
-    VERSION 1.10.5
+    URL    "https://github.com/libcpr/cpr/archive/refs/tags/1.11.1.tar.gz"
+    VERSION 1.11.1
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    OPTIONS "BUILD_SHARED_LIBS FALSE" ${SSL_OPTION}
-)
+    OPTIONS "BUILD_SHARED_LIBS FALSE" "CURL_USE_LIBPSL OFF" "USE_LIBIDN2 OFF" ${SSL_OPTION}
+) 

src/CircularBuffer.hpp

@@ -17,7 +17,7 @@ template <typename T> class CircularBuffer
 
   public:
     // Constructor, sets maxCapacity limit
-    explicit CircularBuffer(const uint32_t &maxCapacity) : max_capacity(maxCapacity)
+    explicit CircularBuffer(const uint32_t maxCapacity) : max_capacity(maxCapacity)
     {
         m_deque.resize(max_capacity);
     }
@@ -32,8 +32,8 @@ template <typename T> class CircularBuffer
     void clean();
 
   private:
-    uint32_t max_capacity{}; // max Capacity
-    std::deque<T> m_deque{}; // actual container of elements
+    uint32_t max_capacity; // max Capacity
+    std::deque<T> m_deque; // actual container of elements
 };
 
 /**

src/GameManager.hpp

@@ -1,5 +1,5 @@
 //
-// Created by Davis on 10/29/2023.
+// Created by Davis on 2023-10-29.
 //
 #pragma once
 
@@ -87,7 +87,7 @@ class GameManager
     [[nodiscard]] const std::vector<chk::Block> &getBlockList() const;
     [[nodiscard]] bool isHunterActive() const;
     [[nodiscard]] const bool isGameOver() const;
-    void setSourceCell(int src_cell);
+    void setSourceCell(const int src_cell);
     void doCleanup();
     void identifyTargets(const chk::PlayerPtr &hunter, const chk::Block &singleCell = nullptr);
     virtual void handleMovePiece(const chk::PlayerPtr &player, const chk::PlayerPtr &opponent, const Block &destCell,

src/MainMenu.hpp

@@ -20,7 +20,7 @@ constexpr auto ICON_PATH = "win-icon-16.png";
 constexpr auto FONT_PATH = "notosans-regular.ttf";
 constexpr auto APP_VERSION = "v1.0.9";
 
-enum class UserChoice : uint16_t
+enum class UserChoice
 {
     LOCAL_PLAY = 38483, // playing offline
     ONLINE_PLAY,        // playing online

src/Piece.hpp

@@ -243,7 +243,7 @@ inline bool Piece::moveCapture(const sf::Vector2f &destPos)
         return false;
     }
 
-    this->move(sf::Vector2f{deltaX, deltaY});
+    this->move(sf::Vector2f{deltaX, deltaY}); // means "move by (x,y) amout"
     this->myCircle.setPosition(this->getPosition());
     if ((this->pieceType == PieceType::Red && destPos.y == 0) ||
         (this->pieceType == PieceType::Black && destPos.y == 7 * chk::SIZE_CELL))

src/Player.hpp

@@ -62,7 +62,7 @@ inline void Player::receivePiece(chk::PiecePtr &piecePtr)
 }
 
 /**
- * When a player's piece is captured, -1 from list
+ * When a player's piece is captured, remove it from basket
  * @param targetId  the captured piece Id
  */
 inline void Player::losePiece(const short targetId)

src/WsClient.hpp

@@ -134,7 +134,7 @@ inline void WsClient::showConnectWindow()
     }
 
     // =================== PRIVATE SERVERS ===============================
-    ImGui::SetNextWindowSize(ImVec2{300.0, 300.0});
+    ImGui::SetNextWindowSize(ImVec2{300.0f, 300.0f});
     static char inputUrl[256] = "127.0.0.1:9876/game";
     if (ImGui::Begin("Private Server", nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse))
     {
@@ -498,7 +498,7 @@ inline void WsClient::runServerLoop()
             }
         }
     }
-    std::scoped_lock lg(this->mut);
+    std::scoped_lock lg{this->mut};
     this->msgBuffer.clean();
 }
 
@@ -513,7 +513,7 @@ inline void WsClient::showErrorPopup()
     }
     // Always center this next dialog
     ImVec2 center = ImGui::GetMainViewport()->GetCenter();
-    ImGui::SetNextWindowPos(center, ImGuiCond_Always, ImVec2{0.5, 0.5});
+    ImGui::SetNextWindowPos(center, ImGuiCond_Always, ImVec2{0.5f, 0.5f});
     ImGui::OpenPopup("Error", ImGuiPopupFlags_NoOpenOverExistingPopup);
     if (ImGui::BeginPopupModal("Error", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
     {
@@ -536,7 +536,7 @@ inline void WsClient::showWinnerPopup()
 {
     // Always center this next dialog
     ImVec2 center = ImGui::GetMainViewport()->GetCenter();
-    ImGui::SetNextWindowPos(center, ImGuiCond_Always, ImVec2{0.5, 0.5});
+    ImGui::SetNextWindowPos(center, ImGuiCond_Always, ImVec2{0.5f, 0.5f});
     ImGui::OpenPopup("GameOver", ImGuiPopupFlags_NoOpenOverExistingPopup);
     if (ImGui::BeginPopupModal("GameOver", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
     {

src/main.cpp

@@ -62,7 +62,7 @@ int main()
     // create pieces and give each player their own
     manager->createAllPieces();
 
-    // Storing currently clicked Piece. (NOTE: using braces constructor)
+    // Storing currently clicked Piece. (NOTE: using curly braces)
     chk::CircularBuffer<short> circularBuffer{1};
 
     // THE STATUS TEXT

src/managers/GameManager.cpp

@@ -190,7 +190,7 @@ const bool GameManager::isPlayerRedTurn() const
  * Store the cell idx from which the piece is LEAVING
  * @param src_cell index of the cell
  */
-void GameManager::setSourceCell(int src_cell)
+void GameManager::setSourceCell(const int src_cell)
 {
     this->sourceCell = src_cell;
 }
@@ -225,7 +225,7 @@ bool GameManager::isHunterActive() const
 }
 
 /**
- * Using cached gameMap, get the PieceId placed at this cell_index
+ * Using cached gameMap, get the PieceId found at this cell_index
  *
  * @param cell_idx the clicked cell
  * @return positive number or -1 if not found