Minor changes

Tested on another project, finded bugs, fixed part with new project settings

Author: kolyaka32

src/GUI/baseGUI.hpp

@@ -42,23 +42,6 @@ namespace GUI {
     };
 
 
-    // Class of slider bar with point on it to control need parameter
-    class Slider : public TextureTemplate {
-     private:
-        SDL_Texture *textureButton;  // Texture of line (upper part of slider)
-        SDL_FRect buttonRect;        // Place for rendering upper part
-        const unsigned maxValue;     // Maximal value of state
-
-     public:
-        // Create slide with need line and button images
-        Slider(const Window& window, float X, float Y, float width, unsigned startValue,
-            Textures lineImage = Textures::SliderLine, Textures buttonImage = Textures::SliderButton, unsigned max = 255);
-        unsigned setValue(float mouseX);  // Setting new state from mouse position
-        unsigned scroll(float wheelY);    // Checking mouse wheel action
-        void blit() const override;       // Drawing slider with need button position
-    };
-
-
     // Class of rounded backplate for better understability
     class RoundedBackplate : public TextureTemplate {
      public:
@@ -83,6 +66,23 @@ namespace GUI {
 
     // Textures
     #if (USE_SDL_IMAGE) && (PRELOAD_TEXTURES)
+    // Class of slider bar with point on it to control need parameter
+    class Slider : public TextureTemplate {
+     private:
+        SDL_Texture *textureButton;  // Texture of line (upper part of slider)
+        SDL_FRect buttonRect;        // Place for rendering upper part
+        const unsigned maxValue;     // Maximal value of state
+
+     public:
+        // Create slide with need line and button images
+        Slider(const Window& window, float X, float Y, float width, unsigned startValue,
+            Textures lineImage = Textures::SliderLine, Textures buttonImage = Textures::SliderButton, unsigned max = 255);
+        unsigned setValue(float mouseX);  // Setting new state from mouse position
+        unsigned scroll(float wheelY);    // Checking mouse wheel action
+        void blit() const override;       // Drawing slider with need button position
+    };
+
+
     // Class of buttons with image on it
     class ImageButton : public TextureTemplate {
      public:

src/GUI/slider.cpp

@@ -6,6 +6,8 @@
 #include "baseGUI.hpp"
 
 
+#if (USE_SDL_IMAGE) && (PRELOAD_TEXTURES)
+
 GUI::Slider::Slider(const Window& _window, float _X, float _Y, float _width, unsigned _startValue,
     Textures _lineImage, Textures _buttonImage, unsigned _max)
 : TextureTemplate(_window),
@@ -52,3 +54,5 @@ unsigned GUI::Slider::scroll(float _wheelY) {
     }
     return 0;
 }
+
+#endif  // (USE_SDL_IMAGE) && (PRELOAD_TEXTURES)

src/data/initFile.hpp

@@ -12,6 +12,8 @@
 
 // Check if has initfile
 #if USE_SETTING_FILE
+#include <string>
+
 
 // Class for load/save settings to/from game
 class InitFile {

src/data/libraries.cpp

@@ -3,11 +3,18 @@
  * <nik.kazankov.05@mail.ru>
  */
 
+#include "libraries.hpp"
+// External libraries for initialisation
 #include <SDL3/SDL.h>
-#include <SDL3_mixer/SDL_mixer.h>
+#if (USE_SDL_FONT)
 #include <SDL3_ttf/SDL_ttf.h>
-#include "libraries.hpp"
+#endif
+#if (USE_SDL_MIXER)
+#include <SDL3_mixer/SDL_mixer.h>
+#endif
+#if (CHECK_CORRECTION)
 #include "exceptions.hpp"
+#endif
 
 
 Libraries::Libraries() {
@@ -18,13 +25,13 @@ Libraries::Libraries() {
         throw LibararyLoadException("Main library: " + std::string(SDL_GetError()));
     }
     // Initialasing font library
-    #if USE_SDL_FONT
+    #if (USE_SDL_FONT)
     if (!TTF_Init()) {
         throw LibararyLoadException("Font library: " + std::string(SDL_GetError()));
     }
     #endif
     // Initialasing audio library
-    #if USE_SDL_MIXER
+    #if (USE_SDL_MIXER)
     if (!Mix_Init(MIX_INIT_MP3 | MIX_INIT_WAVPACK)) {
         throw LibararyLoadException("Mixer library: " + std::string(SDL_GetError()));
     }
@@ -41,10 +48,10 @@ Libraries::Libraries() {
     logAdditional("Libraries load correctly");
     #else  // (CHECK_CORRECTION)
     SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO);
-    #if USE_SDL_FONT
+    #if (USE_SDL_FONT)
     TTF_Init();
     #endif
-    #if USE_SDL_MIXER
+    #if (USE_SDL_MIXER)
     Mix_Init(MIX_INIT_MP3 | MIX_INIT_WAVPACK);
     audioDeviceID = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, NULL);
     Mix_OpenAudio(audioDeviceID, NULL);
@@ -54,16 +61,16 @@ Libraries::Libraries() {
 
 Libraries::~Libraries() noexcept {
     // Closing audio device
-    #if USE_SDL_MIXER
+    #if (USE_SDL_MIXER)
     Mix_CloseAudio();
     SDL_CloseAudioDevice(audioDeviceID);
     #endif
 
     // Closing all library reversed
-    #if USE_SDL_MIXER
+    #if (USE_SDL_MIXER)
     Mix_CloseAudio();
     #endif
-    #if USE_SDL_FONT
+    #if (USE_SDL_FONT)
     TTF_Quit();
     #endif
     SDL_Quit();

src/data/libraries.hpp

@@ -5,13 +5,19 @@
 
 #pragma once
 
+#include "../define.hpp"
+// Check, if use audio in project
+#if (USE_SDL_MIXER)
 #include <SDL3/SDL_audio.h>
+#endif
 
 
 // Class for load and close needed libraries
 class Libraries {
  private:
+    #if (USE_SDL_MIXER)
     SDL_AudioDeviceID audioDeviceID = 0;
+    #endif
 
  public:
     Libraries();

src/data/preloaded/textures.hpp

@@ -9,7 +9,6 @@
 
 // Check, if can load images and preload it
 #if (USE_SDL_IMAGE) && (PRELOAD_TEXTURES)
-
 #include <SDL3/SDL_render.h>
 
 

src/data/window.hpp

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <SDL3/SDL_render.h>
 #include "colors.hpp"
 #include "time.hpp"
 #include "preloaded/textures.hpp"
@@ -97,8 +98,19 @@ class Window {
     SDL_Texture* createTexture(TTF_Font* font, const char* text, Color color) const;
     #endif
 
+    // Draw raw text without TTF library
+    template <typename ...Args>
+    void drawDebugText(float X, float Y, const char* text, const Args& ...args) const;
+
     // Work with window
     void startTextInput() const;
     void stopTextInput() const;
     void updateTitle() const;
 };
+
+
+// Temlates realisation
+template <typename ...Args>
+void Window::drawDebugText(float _X, float _Y, const char* _text, const Args& ..._args) const {
+    SDL_RenderDebugTextFormat(renderer, _X, _Y, _text, _args...);
+}

src/internet/indexesArray.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "indexesArray.hpp"
+#include "../data/logger.hpp"
 
 
 template <unsigned length>

src/internet/indexesArray.hpp

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "connection.hpp"
+#include <SDL3/SDL_stdinc.h>
 
 
 // Class for work with indexes of last get message

src/testing.hpp

@@ -7,7 +7,7 @@
 
 // File for setting flags for all test for program
 // Debuging modifiers
-#define DEBUG true
+#define DEBUG false
 // Logging important information
 #define CHECK_CORRECTION DEBUG
 // Logging all actions (including minor)