added delay to character selection to solve issues with zero-millisec…

…ond execution time; minor renaming

coursework/include/additionally/Initialization.hpp

@@ -15,10 +15,10 @@ using ElementInitializationList = std::initializer_list<ElementInitializationInf
 
 #ifndef NDEBUG
     template <typename T>
-    bool checkUniqueElementTypes(const ElementInitializationList<T> &init_list) {
+    bool checkUniqueElementTypes(const ElementInitializationList<T> &list) {
         bool used[ELEMENT_TYPES_COUNT] = {false};
 
-        for (const auto& curr_info : init_list) {
+        for (const auto& curr_info : list) {
             const size_t index = toSizeT(curr_info.element_type);
             if (used[index])
                 return false;

coursework/include/game/choose character/ChooseCharacterController.hpp

@@ -7,6 +7,7 @@
 #include "../game handlers/game loop/GameLoopState.hpp"
 
 class ChooseCharacterController final {
+    static constexpr size_t WAIT_DELAY = 12;
     static constexpr float BUTTON_SPACING = 80.0f;
     static constexpr float BUTTON_X_INDENT = 20;
     static constexpr float Y_START_FACTOR = 2.7f;

coursework/include/geometry/collision/CollisionTable.hpp

@@ -12,12 +12,12 @@ class CollisionTable final {
 private:
     static constexpr size_t COUNT = ELEMENT_TYPES_COUNT;
     typedef std::array<const AvailableCollisions*, COUNT> AvailableCollisionsTable;
-    using InitList = ElementInitializationList<AvailableCollisions*>;
+    using ElementCollisionInitList = ElementInitializationList<AvailableCollisions*>;
 
     AvailableCollisions _ray_collisions;
     AvailableCollisionsTable _table;
 public:
-    CollisionTable(AvailableCollisions &&ray_collisions, const InitList &init_list);
+    CollisionTable(AvailableCollisions &&ray_collisions, const ElementCollisionInitList &list);
 
     [[nodiscard]] const AvailableCollisions* operator[](const ElementType index) const;
     [[nodiscard]] const AvailableCollisions& getRayCollisions() const;

coursework/include/sprite/SpriteInfos.hpp

@@ -16,25 +16,25 @@ class SpriteInfos final {
     typedef std::array<AbstractInfoVector, Count> AbstractInfos;
     typedef std::array<std::unordered_map<size_t, InfoVector>, Count> Infos;
 
-    struct AbstractTextureLoadInfo final {
+    struct AbstractInfoTextureLoader final {
         static constexpr int DEFAULT_RANGE_VALUE = 0;
         AbstractInfoVector abstract_info_vector;
         sf::Vector2i texture_load_range;
 
         // ReSharper disable once CppNonExplicitConvertingConstructor
-        AbstractTextureLoadInfo(AbstractInfoVector&& info, const sf::Vector2i &texture_load_range
+        AbstractInfoTextureLoader(AbstractInfoVector&& info, const sf::Vector2i &texture_load_range
                                     = {DEFAULT_RANGE_VALUE, DEFAULT_RANGE_VALUE}):
                 abstract_info_vector(std::move(info)), texture_load_range(texture_load_range){}
     };
-    using ElementAbstractTextureLoadInfoList = ElementInitializationList<AbstractTextureLoadInfo>;
+    using AbstractInfoTextureLoadInitList = ElementInitializationList<AbstractInfoTextureLoader>;
 
     const InfoVector& addInfoFromAbstract(const size_t index, const size_t num);
     void handleTextureLoad(const size_t index, const sf::Vector2i &texture_load_range);
 
     AbstractInfos _abstract_infos;
     Infos _infos;
 public:
-    SpriteInfos(const ElementAbstractTextureLoadInfoList &list);
+    SpriteInfos(const AbstractInfoTextureLoadInitList &list);
 
     [[nodiscard]] const InfoVector& getInfo(const ElementType element_type, const size_t num);
     void addInfoFromAbstract(const ElementType element_type, const size_t num);

coursework/src/game/choose character/ChooseCharacterController.cpp

@@ -116,5 +116,6 @@ void ChooseCharacterController::start(GameState& game_state) {
         if (_game_loop_state.is_active)
             draw(_game_loop_state.clock.restart().asMilliseconds());
         handleEvents();
+        sf::sleep(sf::milliseconds(WAIT_DELAY));
     }
 }

coursework/src/geometry/collision/CollisionTable.cpp

@@ -2,16 +2,16 @@
 #include <cassert>
 #include "../../../include/geometry/collision/CollisionTable.hpp"
 
-CollisionTable::CollisionTable(AvailableCollisions &&ray_collisions, const InitList &init_list) {
-    assert(checkUniqueElementTypes(init_list)
+CollisionTable::CollisionTable(AvailableCollisions &&ray_collisions, const ElementCollisionInitList &list) {
+    assert(checkUniqueElementTypes(list)
         && "Error in CollisionTable constructor: Duplicate ElementType found");
-    assert(init_list.size() <= COUNT
+    assert(list.size() <= COUNT
         && "Error in CollisionTable constructor: List size should be less than or equal to ELEMENT_TYPES_COUNT");
 
     _ray_collisions = std::move(ray_collisions);
 
     std::fill(_table.begin(), _table.end(), nullptr);
-    for (const auto& [element_type, set_element_types] : init_list) {
+    for (const auto& [element_type, set_element_types] : list) {
         assert(toSizeT(element_type) < COUNT && "Error in CollisionTable constructor: Index out of bounds");
         _table[toSizeT(element_type)] = set_element_types;
     }

coursework/src/gui/UIController/LoadingScreen.cpp

@@ -1,7 +1,5 @@
 // ReSharper disable CppIncompleteSwitchStatement CppDefaultCaseNotHandledInSwitchStatement CppClangTidyClangDiagnosticSwitch CppTooWideScopeInitStatement CppTooWideScope
 #include <stdexcept>
-#include <chrono>
-#include <thread>
 #include "../../../include/gui/UIController/LoadingScreen.hpp"
 #include "../../../include/additionally/AdditionalFunc.hpp"
 #include "../../../include/gui/ReservedKeys.hpp"
@@ -99,7 +97,7 @@ void LoadingScreen::end() {
     static constexpr int MAX_ATTEMPTS = 42;
     int attempts = 0;
     while (!_continue_screen) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_DELAY));
+        sf::sleep(sf::milliseconds(WAIT_DELAY));
         #ifndef NDEBUG
         if (++attempts >= MAX_ATTEMPTS)
             throw std::runtime_error("Exceeded maximum attempts in LoadingScreen::end()");

coursework/src/sprite/SpriteInfos.hpp

@@ -24,7 +24,7 @@ void SpriteInfos<StartIndex, Count, Abstract, Info, T0, T1>::handleTextureLoad(c
 }
 
 template <size_t StartIndex, size_t Count, typename Abstract, typename Info, typename T0, typename T1>
-SpriteInfos<StartIndex, Count, Abstract, Info, T0, T1>::SpriteInfos(const ElementAbstractTextureLoadInfoList& list) {
+SpriteInfos<StartIndex, Count, Abstract, Info, T0, T1>::SpriteInfos(const AbstractInfoTextureLoadInitList& list) {
     assert(checkUniqueElementTypes(list)
         && "Error in SpriteInfos constructor: Duplicate ElementType found");
     assert(list.size() == Count