Updated static object structure

Now creating global objects work properly
Small changes in define options

Author: kolyaka32

src/data/app.hpp

@@ -13,7 +13,7 @@
 
 
 // Class of whole current application
-class App : Libraries {
+class App {
  private:
     // Flags of work
     static bool running;

src/data/libraries.cpp

@@ -33,6 +33,7 @@ Libraries::Libraries() {
     if (!Mix_OpenAudio(audioDeviceID, NULL)) {
         throw LibararyLoadException("Couldn't initialase audio chanel: " + std::string(SDL_GetError()));
     }
+    logAdditional("Libraries load correctly");
     #else
     SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO);
     TTF_Init();

src/data/libraries.hpp

@@ -3,6 +3,8 @@
  * <nik.kazankov.05@mail.ru>
  */
 
+#pragma once
+
 #include <SDL3/SDL_audio.h>
 #include "exceptions.hpp"
 

src/data/preloaded/loader/loader.cpp

@@ -6,17 +6,16 @@
 #pragma once
 
 // System numbers
-#define WINDOW_NAME "Tic-tac-toe on SDL"  // System game name
-#define CELL_SIDE 100                     // Width and height of mine in pixels
-#define SEPARATOR 5                       // Width of separator between cells in pixels
+#define WINDOW_NAME "Tic-tac-toe on SDL"    // System game name
+#define CELL_SIDE 100                       // Width and height of mine in pixels
+#define SEPARATOR 5                         // Width of separator between cells in pixels
 
 // Internet constants
 #define BASE_PORT 8000                      // Base port to create/connect
 #define MAX_SEND_ID 128                     // Maximal number of send message ID
 #define MESSAGE_GET_TIMEOUT 5000            // Time after which connection is considered lost
 #define MESSAGE_APPLY_TIMEOUT 2000          // Time to send apply message to keep connecion
 #define MESSAGE_RESEND_TIMEOUT 250          // Time after which need to resend message, as it was lost
-#define CONNECTION_LOST_PERCENT 0           // Option for better testing of connection stability
 
 // Base file names
 #define SETTING_FILE "settings-tic-tac-toe.ini"  // File with all starting data (width, height...)

src/define.hpp

@@ -8,6 +8,7 @@
 
 float GameField::upperLineHeight;
 int GameField::offset;
+Field GameField::field{};
 
 GameField::GameField(const Window& _window)
 : Template(_window) {}

src/game/gameField.cpp

@@ -3,7 +3,7 @@
  * <nik.kazankov.05@mail.ru>
  */
 
-#include "data/app.hpp"
+#include "data/libraries.hpp"
 // Load needed loader, depend on teting
 #if ARCHIEVE_LOADING
 #include "data/preloaded/loader/archieveLoader.hpp"
@@ -16,12 +16,16 @@
 #include "cycles/selectCycle.hpp"
 
 
+// Selecting loader for data, depend on testing
+Libraries libraries;
+#if ARCHIEVE_LOADING
+const ArchieveLoader dataLoader{};
+#else
+const StraightLoader dataLoader{};
+#endif
 // Static game objects
 SoundsData sounds{};
 MusicData music{};
-Field GameField::field{};
-InitFile initFile{};
-
 
 // Main function
 int main(int argv, char **args) {

src/main.cpp

@@ -13,6 +13,8 @@
 #include "cycles/clientLobby.hpp"
 
 
+InitFile initFile{};
+
 // Data, load from setting file
 void InitFile::loadSettings() {
     // Reading file

src/settingFile.cpp

@@ -7,7 +7,10 @@
 
 // File for setting flags for all test for program
 // Debuging modifiers
-#define DEBUG true
+#define DEBUG false
 #define CHECK_CORRECTION DEBUG
 #define CHECK_ALL DEBUG
-#define ARCHIEVE_LOADING DEBUG
+#define ARCHIEVE_LOADING !DEBUG
+
+// Internet testing
+#define CONNECTION_LOST_PERCENT 0  // Testing connection stability