Merge pull request #5 from kolyaka32/Dev-branch

Preloaded systems rework

Author: kolyaka32

src/GUI/baseGUI.hpp

@@ -19,19 +19,20 @@ namespace GUI {
 
 
     // Graphic user interface template for other objects
-    class GUItemplate {
+    class Template {
      protected:
         SDL_Texture* texture;
         SDL_FRect rect;
+
      public:
-        GUItemplate();
+        Template();
         virtual void blit() const;
         bool in(const Mouse mouse) const;
     };
 
 
     // Static text on screen
-    class StaticText : public GUItemplate {
+    class StaticText : public Template {
      public:
         StaticText(float X, float Y, const LanguagedText texts,
             float size, Color color = WHITE, Aligment aligment = Aligment::Midle);
@@ -40,22 +41,22 @@ namespace GUI {
 
 
     // Static text on screen
-    class HighlightedStaticText : public GUItemplate {
+    class HighlightedStaticText : public Template {
      public:
-        HighlightedStaticText(float X, float Y, const LanguagedText texts, 
+        HighlightedStaticText(float X, float Y, const LanguagedText texts,
             int frameThickness, float size, Color color = WHITE, Aligment aligment = Aligment::Midle);
         ~HighlightedStaticText();
     };
 
 
     // Dynamicly updated text on screen
-    class DynamicText : public GUItemplate {
+    class DynamicText : public Template {
      private:
-        const LanguagedText texts;             // Text to create from
-        const float posX;                      // Relative positions on screen
-        const Aligment aligment;               // Aligment type to improve displasment
-        const Color color;                     // Base draw color
-        const float height;                    // Height of text to draw
+        const LanguagedText texts;  // Text to create from
+        const float posX;           // Relative positions on screen
+        const Aligment aligment;    // Aligment type to improve displasment
+        const Color color;          // Base draw color
+        const float height;         // Height of text to draw
 
      public:
         DynamicText(float X, float Y, const LanguagedText texts,
@@ -65,10 +66,10 @@ namespace GUI {
         void setValues(Args&& ...args) {
             // Checking for all chars
             char buffer[100];
-            std::sprintf(buffer, texts.getString().c_str(), std::forward<Args>(args)...);
+            std::snprintf(buffer, sizeof(buffer), texts.getString().c_str(), args...);
 
             // Creating surface with text
-            texture = window.createTexture(FNT_MAIN, height, buffer, 0, color);
+            texture = window.createTexture(Fonts::Main, height, buffer, 0, color);
 
             // Moving draw rect to new place
             rect.w = texture->w;
@@ -79,35 +80,34 @@ namespace GUI {
 
 
     // Class of slider bar with point on it to control need parameter
-    class Slider : public GUItemplate {
+    class Slider : public Template {
      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(float X, float Y, float width, unsigned startValue, IMG_names lineImage = IMG_GUI_SLIDER_LINE,
-            IMG_names buttonImage = IMG_GUI_SLIDER_BUTTON, unsigned max = 255);
+        Slider(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 GUItemplate {
-    public:
-        ImageButton(float X, float Y, float width, IMG_names textureIndex);
+    class ImageButton : public Template {
+     public:
+        ImageButton(float X, float Y, float width, Textures name);
     };
 
 
     // GIF-animations
     #if ANI_count
-    class GIFAnimation : public GUItemplate {
+    class GIFAnimation : public Template {
      private:
         const Uint8 type;
-        SDL_Texture* texture = nullptr;
         Uint64 prevTick;
         const SDL_FRect dest;
 
@@ -167,7 +167,7 @@ namespace GUI {
     };
 
     // Class of backplate for
-    class Backplate : public GUItemplate {
+    class Backplate : public Template {
      public:
         Backplate(float centerX, float centerY, float width, float height, float radius, float border,
             Color frontColor = GREY, Color backColor = BLACK);
@@ -176,6 +176,7 @@ namespace GUI {
         ~Backplate();
     };
 
+
     // Class of buttons with text on it
     class TextButton : public HighlightedStaticText {
      private:
@@ -187,6 +188,7 @@ namespace GUI {
         void blit() const override;
     };
 
+
     // Class of appearing for time and hidden by time text
     class InfoBox : public HighlightedStaticText {
      private:

src/GUI/dynamicText.cpp

@@ -16,7 +16,7 @@ texts(_texts),
 height(_height) {
     rect.y = window.getHeight() * _Y - height / 2;
     // Creating surface with text
-    texture = window.createTexture(FNT_MAIN, height, texts.getString().c_str(), 0, color);
+    texture = window.createTexture(Fonts::Main, height, texts.getString().c_str(), 0, color);
 
     // Moving draw rect to new place
     rect.w = texture->w;

src/GUI/highlightedStaticText.cpp

@@ -9,7 +9,7 @@
 GUI::HighlightedStaticText::HighlightedStaticText(float _X, float _Y,
     const LanguagedText _texts, int frame, float _height, Color _color, Aligment _aligment) {
     // Creating texture of text
-    TTF_Font* font = window.getFont(FNT_MAIN);
+    TTF_Font* font = window.getFont(Fonts::Main);
     TTF_SetFontSize(font, _height);
     TTF_SetFontOutline(font, frame);
 

src/GUI/imageButton.cpp

@@ -6,15 +6,15 @@
 #include "baseGUI.hpp"
 
 
-GUI::ImageButton::ImageButton(float _X, float _Y, float _width, IMG_names _index) {
+GUI::ImageButton::ImageButton(float _X, float _Y, float _width, Textures _index) {
     // Setting base texture
     texture = window.getTexture(_index);
 
     // Setting destination
     SDL_GetTextureSize(texture, &rect.w, &rect.h);
     rect.w = _width * window.getWidth();
     rect.h = texture->h * rect.w / texture->w;
-    
+
     rect.x = window.getWidth() * _X - rect.w / 2;
     rect.y = window.getHeight() * _Y - rect.h / 2;
 }

src/GUI/slider.cpp

@@ -8,7 +8,7 @@
 
 // Slider class
 GUI::Slider::Slider(float _X, float _Y, float _width, unsigned _startValue,
-    IMG_names _lineImage, IMG_names _buttonImage, unsigned _max)
+    Textures _lineImage, Textures _buttonImage, unsigned _max)
 : maxValue(_max) {
     // Getting need texture
     texture = window.getTexture(_lineImage);
@@ -22,7 +22,7 @@ GUI::Slider::Slider(float _X, float _Y, float _width, unsigned _startValue,
     rect.x = window.getWidth() * _X - rect.w / 2;
     rect.y = window.getHeight() * _Y - rect.h / 2;
     buttonRect.y = window.getHeight() * _Y - buttonRect.h / 2;
-    buttonRect.x = rect.x + _startValue - buttonRect.w / 2;
+    buttonRect.x = rect.x + rect.w * _startValue / maxValue - buttonRect.w / 2;
 }
 
 void GUI::Slider::blit() const {

src/GUI/staticText.cpp

@@ -10,7 +10,7 @@
 GUI::StaticText::StaticText(float _X, float _Y, const LanguagedText _texts,
     float _height, Color _color, Aligment _aligment) {
     // Creating texture of text
-    texture = window.createTexture(FNT_MAIN, _height, _texts.getString().c_str(), 0, _color);
+    texture = window.createTexture(Fonts::Main, _height, _texts.getString().c_str(), 0, _color);
 
     // Updating rect height for correct button
     SDL_GetTextureSize(texture, &rect.w, &rect.h);

src/GUI/template.cpp

@@ -7,16 +7,16 @@
 
 
 // Tempate function for resetting texture
-GUI::GUItemplate::GUItemplate() {
+GUI::Template::Template() {
     texture = nullptr;
 }
 
 // Template function for draw
-void GUI::GUItemplate::blit() const {
+void GUI::Template::blit() const {
     window.blit(texture, rect);
 }
 
 // Template function for check, if mouse press in object
-bool GUI::GUItemplate::in(const Mouse mouse) const {
+bool GUI::Template::in(const Mouse mouse) const {
     return mouse.in(rect);
 }

src/GUI/typeField.cpp

@@ -14,8 +14,9 @@ GUI::TypeField<bufferSize>::TypeField(float _X, float _Y, float _height, const c
 : posX(window.getWidth()*_X),
 aligment(_aligment),
 textColor(_color),
-font(window.createFontCopy(FNT_MAIN, _height)),
-backRect({_X*window.getWidth()-(6.5f*bufferSize+2), _Y*window.getHeight()-_height*0.9f, 13.0f*bufferSize+4, _height*1.8f}) {
+font(window.createFontCopy(Fonts::Main, _height)),
+backRect({_X*window.getWidth() - (6.5f*bufferSize+2), _Y*window.getHeight()-_height * 0.9f,
+    13.0f * bufferSize+4, _height * 1.8f}) {
     // Setting rects
     textRect = {0, window.getHeight()*_Y-_height/2-1, 0, 0};
     caretRect = {0, window.getHeight()*_Y-_height/2-1, 2, _height*1.3f};
@@ -99,7 +100,7 @@ void GUI::TypeField<bufferSize>::updateTexture() {
         textRect.w = textTexture->w;
         textRect.h = textTexture->h;
         textRect.x = SDL_floorf(posX - textRect.w * (unsigned)aligment / 2);
-        
+
         // Update caret place
         if (caret) {
             int caretX = 0;

src/cycles/baseCycle.cpp

@@ -8,7 +8,7 @@
 
 // Base cycle class
 BaseCycle::BaseCycle()
-: exitButton(0.04, 0.05, 0.08, IMG_GUI_QUIT_BUTTON),
+: exitButton(0.04, 0.05, 0.08, Textures::QuitButton),
 settings() {}
 
 bool BaseCycle::inputMouseDown() {

src/cycles/clientGame.cpp

@@ -7,7 +7,7 @@
 #include "selectCycle.hpp"
 
 
-ClientGameCycle::ClientGameCycle(Connection& _client)
+ClientGameCycle::ClientGameCycle(const Connection& _client)
 : InternetCycle(),
 connection(_client),
 waitText(0.5, 0.05, {"Wait start", "Ожидайте начала", "Warte auf Start", "Чаканне старту"}, 24) {}
@@ -29,16 +29,11 @@ bool ClientGameCycle::inputMouseDown() {
         if (field.tryClickMultiplayerCurrent(mouse)) {
             // Making sound
             sounds.play(Sounds::Turn);
+            music.startFromCurrent(Music::MainCombat);
+
             // Sending to opponent
-            connection.sendConfirmed<Uint8, Uint8>(ConnectionCode::GameTurn, field.getXPos(mouse), field.getYPos(mouse));
-            // Changing music theme
-            if (firstTurn) {
-                music.startFromCurrent(Music::MainCombat);
-                firstTurn = false;
-                #if CHECK_ALL
-                SDL_Log("Start combat music");
-                #endif
-            }
+            connection.sendConfirmed<Uint8, Uint8>(ConnectionCode::GameTurn,
+                field.getXPos(mouse), field.getYPos(mouse));
         }
     }
     return false;
@@ -59,37 +54,28 @@ void ClientGameCycle::update() {
     case ConnectionCode::GameTurn:
         if (connection.lastPacket->isBytesAvaliable(4)) {
             #if CHECK_CORRECTION
-            SDL_Log("Turn of opponent player: from %u to %u", connection.lastPacket->getData<Uint8>(2), connection.lastPacket->getData<Uint8>(3));
+            SDL_Log("Turn of opponent player: from %u to %u",
+                connection.lastPacket->getData<Uint8>(2), connection.lastPacket->getData<Uint8>(3));
             #endif
-            field.clickMultiplayerOpponent(connection.lastPacket->getData<Uint8>(2), connection.lastPacket->getData<Uint8>(3));
+            field.clickMultiplayerOpponent(connection.lastPacket->getData<Uint8>(2),
+                connection.lastPacket->getData<Uint8>(3));
             // Making sound
             sounds.play(Sounds::Turn);
             // Changing music theme
-            if (firstTurn) {
-                music.startFromCurrent(Music::MainCombat);
-                firstTurn = false;
-                #if CHECK_ALL
-                SDL_Log("Start combat music");
-                #endif
-            }
+            music.startFromCurrent(Music::MainCombat);
         }
         return;
 
     case ConnectionCode::GameClear:
+        // Making sound
+        sounds.play(Sounds::Reset);
+        music.startFromCurrent(Music::MainCalm);
+
         // Resetting game
+        field.reset();
         #if CHECK_CORRECTION
         SDL_Log("Resetting game by connection");
         #endif
-        field.reset();
-        if (!firstTurn) {
-            music.startFromCurrent(Music::MainCalm);
-            #if CHECK_ALL
-            SDL_Log("Stop combat music");
-            #endif
-        }
-        firstTurn = true;
-        // Making sound
-        sounds.play(Sounds::Reset);
         return;
 
     case ConnectionCode::GameStart: