Merge pull request #159 from Longwater1234/dev

Author: Longwater1234

BUILDING.md

@@ -17,7 +17,7 @@
 mkdir build
 cd build
 cmake . . -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target all
+cmake --build . --config Release --target all -j
 
 ```
 

CMakeLists.txt

@@ -13,6 +13,12 @@ if (NOT APPLE)
   set(SFML_STATIC_LIBRARIES TRUE) 
 endif() 
 
+# defualt to building in "RELEASE" mode
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+    "Choose the type of build." FORCE)
+endif()
+
 # write app version into Header
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/src/proto_schema/AppVersion.hpp.in

cmake/macbundle.cmake

@@ -6,11 +6,14 @@ set_source_files_properties(${application_icon}
 
 # images
 file(GLOB_RECURSE my_images "${CMAKE_SOURCE_DIR}/resources/*")
-foreach(FILE ${my_images})
-  file(RELATIVE_PATH NEW_FILE "${CMAKE_SOURCE_DIR}/" ${FILE})
-  get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
-  set_source_files_properties(${FILE} PROPERTIES MACOSX_PACKAGE_LOCATION
-                                                 "Resources/${NEW_FILE_PATH}")
+foreach(FILE ${my_images}) 
+  get_filename_component(FILENAME ${FILE} DIRECTORY)
+  # SKIP .DS_Store files
+  if (NOT FILENAME STREQUAL ".DS_Store")   
+    file(RELATIVE_PATH NEW_FILE "${CMAKE_SOURCE_DIR}/" ${FILE})
+    get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
+    set_source_files_properties(${FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
+  endif()
 endforeach()
 
 add_executable(${CMAKE_PROJECT_NAME} MACOSX_BUNDLE

src/CircularBuffer.hpp

@@ -24,10 +24,11 @@ template <typename T> class CircularBuffer
     CircularBuffer() = delete;
     CircularBuffer &operator=(const CircularBuffer &) = delete;
     CircularBuffer(CircularBuffer &other) = delete;
-    void addItem(const T &item);
-    T &getTop() noexcept;
+    void addItem(const T &item); // copy overload
+    void addItem(T &&item);      // Move overload
+    T &getFront() noexcept;
     void removeFirst();
-    [[nodiscard]] bool isEmpty() const;
+    [[nodiscard]] bool isEmpty() const noexcept;
     const std::deque<T> &getAll() const;
     void clean();
 
@@ -50,7 +51,7 @@ template <typename T> void CircularBuffer<T>::clean()
  * @tparam T any type
  * @return TRUE or FALSE
  */
-template <typename T> bool CircularBuffer<T>::isEmpty() const
+template <typename T> bool CircularBuffer<T>::isEmpty() const noexcept
 {
     return m_deque.empty();
 }
@@ -68,7 +69,7 @@ template <typename T> inline const std::deque<T> &CircularBuffer<T>::getAll() co
  * @tparam T any type
  * @return The first element in queue
  */
-template <typename T> T &CircularBuffer<T>::getTop() noexcept
+template <typename T> T &CircularBuffer<T>::getFront() noexcept
 {
     return m_deque.front();
 }
@@ -78,11 +79,14 @@ template <typename T> T &CircularBuffer<T>::getTop() noexcept
  */
 template <typename T> void CircularBuffer<T>::removeFirst()
 {
-    m_deque.pop_front();
+    if (!m_deque.empty())
+    {
+        m_deque.pop_front();
+    }
 }
 
 /**
- * Add new element to buffer
+ * Add new element to buffer (using copy)
  * @tparam T any type
  * @param item the element to be inserted
  */
@@ -95,4 +99,18 @@ template <typename T> void CircularBuffer<T>::addItem(const T &item)
     }
     m_deque.emplace_back(item);
 }
+
+/**
+ * Move element into the buffer
+ * @tparam T any type
+ * @param item the element to be inserted
+ */
+template <typename T> void CircularBuffer<T>::addItem(T &&item)
+{
+    if (m_deque.size() >= max_capacity)
+    {
+        m_deque.pop_front();
+    }
+    m_deque.emplace_back(std::move(item));
+}
 } // namespace chk

src/managers/GameManager.cpp

@@ -314,7 +314,7 @@ void chk::GameManager::handleCellTap(const chk::PlayerPtr &hunter, const chk::Pl
         // Cell is Empty! Let's judge if this is SIMPLE move or ATTACK move
         if (!buffer.isEmpty())
         {
-            const short movablePieceId = buffer.getTop();
+            const short movablePieceId = buffer.getFront();
             if (!hunter->hasThisPiece(movablePieceId))
             {
                 return;

src/managers/OnlineGameManager.hpp

@@ -417,7 +417,7 @@ inline void OnlineGameManager::handleCellTap(const chk::PlayerPtr &hunter, const
         // Cell is Empty! Let's judge if this is SIMPLE move or ATTACK move
         if (!buffer.isEmpty())
         {
-            const short movablePieceId = buffer.getTop();
+            const short movablePieceId = buffer.getFront();
             if (!hunter->hasThisPiece(movablePieceId))
             {
                 return;