Merge pull request #171 from Longwater1234/dev

Only highlight pieces which belong to current player

Author: Longwater1234

CMakeLists.txt

@@ -2,14 +2,15 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 project(
   "SpaceCheckers"
-  VERSION 1.0.12
+  VERSION 1.0.13
   HOMEPAGE_URL "https://github.com/Longwater1234/space-checkers")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
+
 # On macOS using Frameworks, NOT static (dylib)
 if(NOT APPLE)
   set(SFML_STATIC_LIBRARIES TRUE)

README.md

@@ -27,7 +27,7 @@ This game can connect to both Private and Public game servers. The backend serve
 - MS Visual Studio 2022 or newer (NOT vscode), with "**Desktop C++ Development**" bundle.
 - Please download "Visual C++ 64bit" edition of SFML; ignore others.
 - Move your unzipped `SFML-2.6.x` folder to its own home, example: `C:/SFML/SFML-2.6.1`.
-- Edit **line 24** in [CMakeLists.txt](CMakeLists.txt#L24), to set value `SFML_HOME` to folder path you moved SFML into (from previous step)
+- Edit **line 25** in [CMakeLists.txt](CMakeLists.txt#L25), to set value `SFML_HOME` to folder path you moved SFML into (from previous step)
 
 ### For macOS (x64 & arm64)
 

src/AppVersion.hpp

@@ -5,7 +5,7 @@
 
 // clang-format off
 namespace chk {
-  constexpr const char* APP_VERSION = "1.0.12";
+  constexpr const char* APP_VERSION = "1.0.13";
 }
 
 #endif // APP_VERSION_HPP

src/Cell.hpp

@@ -121,7 +121,7 @@ const inline sf::Vector2f &Cell::getPos() const
 }
 
 /**
- * (ONLY FOR PLAYABLE CELLS) Highlight the currently clicked cell with a piece with BLUE
+ * (ONLY FOR PLAYABLE CELLS) Highlight with BLUE the currently clicked cell with a piece
  */
 inline void Cell::highlightActive()
 {

src/WsClient.cpp

@@ -204,7 +204,7 @@ void WsClient::runMainLoop()
 
     else {
         // already connected
-        this->runServerLoop();
+        this->readIncomingSignals();
     }
 
     // some error happened 🙁
@@ -216,6 +216,7 @@ void WsClient::runMainLoop()
     } else if (this->haveWinner) {
         this->showWinnerPopup();
     }
+    // clang-format on
 }
 
 /**
@@ -331,7 +332,7 @@ void WsClient::setOnWinLoseCallback(const onWinLoseCallback &callback)
 
 /**
  * Send Protobuf response back to server.
- * 
+ *
  * @param payload the request body
  * @return TRUE if sent successfully, else FALSE
  */
@@ -351,10 +352,10 @@ bool WsClient::replyServer(const chk::payload::BasePayload &payload) const
 }
 
 /**
- * Exchange messages with the server and update the game accordingly. if any
- * error happens, close connection
+ * Read messages from server and update the game accordingly. If any
+ * error happens or match ends, close connection
  */
-void WsClient::runServerLoop()
+void WsClient::readIncomingSignals()
 {
     for (const auto &msg : this->msgBuffer.getAll())
     {
@@ -365,9 +366,9 @@ void WsClient::runServerLoop()
         chk::payload::BasePayload basePayload;
         if (!basePayload.ParseFromString(msg))
         {
+            this->isDead = true;
             std::scoped_lock lg{this->mut};
             this->deathNote = "Profobuf: Could not parse payload";
-            this->isDead = true;
             return;
         }
 
@@ -390,6 +391,7 @@ void WsClient::runServerLoop()
         else if (basePayload.has_exit_payload())
         {
             this->isDead = true;
+            std::scoped_lock lg{this->mut};
             this->deathNote = basePayload.notice();
             spdlog::error(basePayload.notice());
         }

src/WsClient.hpp

@@ -27,7 +27,7 @@ using onDeathCallback = std::function<void(std::string_view notice)>;
 using onMovePieceCallback = std::function<void(const chk::payload::MovePayload &)>;
 // when opponent captures my piece
 using onCaptureCallback = std::function<void(const chk::payload::CapturePayload &)>;
-// when we got a winner or loser
+// when we get a winner or loser
 using onWinLoseCallback = std::function<void(std::string_view notice)>;
 // CDN address
 constexpr auto cloudfront = "https://d1txhef4jwuosv.cloudfront.net/ws_server_locations.json";
@@ -72,7 +72,7 @@ class WsClient final
     std::mutex mut;
     std::unique_ptr<ix::WebSocket> webSocketPtr = nullptr; // our Websocket object
     void showErrorPopup();                                 // whenver there is an error (from server)
-    void runServerLoop();                                  // while connected, keep exchanging messages with server
+    void readIncomingSignals();                            // while connected, keep reading messages from server
     static void showHint(const char *tip);
     void tryConnect(std::string_view address);
     void showConnectWindow();

src/main.cpp

@@ -18,7 +18,7 @@ int main()
     GOOGLE_PROTOBUF_VERIFY_VERSION;
     auto window = sf::RenderWindow{sf::VideoMode{600, 700}, "SpaceCheckers", sf::Style::Titlebar | sf::Style::Close};
     window.setFramerateLimit(60);
-    ImGui::SFML::Init(window, false);
+    (void)ImGui::SFML::Init(window, false);
     // ImGui::StyleColorsLight(); //<-- light color theme
     std::unique_ptr<chk::GameManager> manager = nullptr;
 
@@ -39,7 +39,7 @@ int main()
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
     ImFont *imfont = io.Fonts->AddFontFromFileTTF(chk::getResourcePath(chk::FONT_PATH).c_str(), chk::FONT_SIZE);
     IM_ASSERT(imfont != nullptr);
-    ImGui::SFML::UpdateFontTexture();
+    (void)ImGui::SFML::UpdateFontTexture();
 
     sf::Image appIcon;
     if (appIcon.loadFromFile(chk::getResourcePath(chk::ICON_PATH)))

src/managers/GameManager.cpp

@@ -163,7 +163,7 @@ void GameManager::handleCapturePiece(const chk::PlayerPtr &hunter, const chk::Pl
     this->forcedMoves.clear();
     if (isKingBefore == isKingNow)
     {
-        GameManager::identifyTargets(hunter, targetCell);
+        this->identifyTargets(hunter, targetCell);
     }
 
     if (this->forcedMoves.empty())
@@ -226,7 +226,7 @@ bool GameManager::isHunterActive() const
 }
 
 /**
- * Using cached gameMap, get the PieceId found at this cell_index
+ * Using cached gameMap, get the piece_id found at this cell
  *
  * @param cell_idx the clicked cell
  * @return positive number or -1 if not found
@@ -242,7 +242,8 @@ short GameManager::getPieceFromCell(const int cell_idx) const
 
 /**
  * Match cells to pieces at game launch, using position, and cache it to Hashmap
- * @param pieceList vector of all pieces
+ *
+ * @param pieceList vector containing all pieces
  */
 void GameManager::matchCellsToPieces(const std::vector<chk::PiecePtr> &pieceList)
 {
@@ -308,13 +309,17 @@ void chk::GameManager::handleCellTap(const chk::PlayerPtr &hunter, const chk::Pl
     if (pieceId != -1)
     {
         // YES, it has one! VERIFY IF THERE IS ANY PENDING "forced captures".
-        // If yes, ensure hunter is SELECTED!
         if (!this->getForcedMoves().empty() && this->forcedMoves.find(pieceId) == forcedMoves.end())
         {
             this->showForcedMoves(hunter, cell);
             return;
         }
-        // OTHERWISE, store it in buffer (for a SIMPLE/CAPTURE move next)!
+        // Does current player own this piece?
+        if (!hunter->hasThisPiece(pieceId))
+        {
+            return;
+        }
+        // Store it in buffer (for a SIMPLE/CAPTURE move next!)
         buffer.addItem(pieceId);
         this->setSourceCell(cell->getIndex());
         cell->highlightActive();
@@ -413,7 +418,7 @@ bool GameManager::awayFromEdge(const int cell_idx) const
 /**
  * Collect all possible next "forced captures" for this hunter.
  * @param hunter Current player
- * @param singleCell if not NULL, only collect around this cell. Otherwise, loop ENTIRE board
+ * @param singleCell if NOT null, then only collect around this cell. Otherwise, loop ENTIRE board
  */
 void GameManager::identifyTargets(const PlayerPtr &hunter, const chk::Block &singleCell)
 {
@@ -424,7 +429,7 @@ void GameManager::identifyTargets(const PlayerPtr &hunter, const chk::Block &sin
         const short pieceId = this->getPieceFromCell(singleCell->getIndex());
         if (gameMap.find(singleCell->getIndex()) == gameMap.end() || !hunter->hasThisPiece(pieceId))
         {
-            // this CELL is not usable, OR piece not OWNED by hunter
+            // this CELL is not usable, OR piece not owned to hunter
             return;
         }
         this->collectFrontLHS(hunter, singleCell);

src/managers/OnlineGameManager.hpp

@@ -416,6 +416,11 @@ inline void OnlineGameManager::handleCellTap(const chk::PlayerPtr &hunter, const
             this->showForcedMoves(hunter, cell);
             return;
         }
+        // Does current player own this piece?
+        if (!hunter->hasThisPiece(pieceId))
+        {
+            return;
+        }
         // OTHERWISE, store it in buffer (for a simple move, on next turn)
         buffer.addItem(pieceId);
         this->setSourceCell(cell->getIndex());