rebase from main + remove leaks

Author: petitlapin

src/editor.cc

@@ -243,6 +243,9 @@ void Editor::Draw() const
         Sprites[deco].Draw(m_level.T[NumN].Deco[i].x, m_level.T[NumN].Deco[i].y, m_level.T[NumN].Deco[i].NumSpr);
     }
 
+    // Displays the level number
+    //DrawNumber(740, 130, NumN + 1);
+
     // Display possible sprites
     for (i = 0; i < LT * HT; i++) {
         switch (T[i]) {

src/game.cc

@@ -359,10 +359,11 @@ bool Game::DrawLevel(int LevelN)
 #endif
 
     // Displays texts for selected language
+    m_screen.ChangeFontSize(20);
     m_screen.ChangeFontColor(255, 255, 0);
     m_screen.PrintText("Level", 740-m_screen.TextLength("Level")/2, 110);
     m_screen.PrintText("Score", 740-m_screen.TextLength("Score")/2, 180);
-    m_screen.PrintText("Config", 740-m_screen.TextLength("Config")/2, 260);
+    m_screen.PrintText("Options", 740-m_screen.TextLength("Options")/2, 260);
     m_screen.PrintText("Lives", 740-m_screen.TextLength("Lives")/2, 340);
     m_screen.ChangeFontColor(255, 255, 255);
 

src/menu.cc

@@ -646,13 +646,13 @@ eMenu Menu::SDLMain_Options()
 
         switch (Pref.AudioTheme) {
         case mMaf:
-            DrawString(400, 420, "MAF 464", Sprites[fmenu].Image[0]);
+            m_screen.PrintText("MAF 464", 400, 390);
             break;
         case mZabiden:
-            DrawString(400, 420, "ZABIDEN", Sprites[fmenu].Image[0]);
+            m_screen.PrintText("ZABIDEN", 400, 390);
             break;
         }
-        DrawString(350, 370, "Audio Theme", Sprites[fmenu].Image[0]);
+        m_screen.PrintText("Audio Theme", 360, 340);
 
         NumSp = (currentTime / 30) % 25;
         m_screen.PrintSprite(sound, NumSp, 150, 110);
@@ -1147,7 +1147,7 @@ eMenu Menu::SDLMain_HR()
             }
         }
 
-        // Test if Endished
+        // Test if finished
         if (Done != -1 && Done < currentTime) {
             return mGame;
         }
@@ -1320,32 +1320,31 @@ eMenu Menu::SDLMain_Score(bool EditScore)
     char Provi[256];
     char key;
 
-    // Cherche le numéro du score à remplacer si edition des scores
+    // Searches the score index to edit
     if (EditScore) {
-        for (i = 0; i < 8; i++) {
+        for (i = 7; i >= 0; i--) {
             if (Pref.Sco[i].Score < Pref.Score) {
                 NEdit = i;
-                break;
             }
         }
         if (NEdit == -1) {
             return mMenu;
         }
 
-        if (NEdit < 7) { // Si doit fair un décalage
+        if (NEdit < 7) { // if shifting must be done
             for (i = 7; i > NEdit; i--) {
                 Pref.Sco[i].Score = Pref.Sco[i - 1].Score;
                 Pref.Sco[i].Name = Pref.Sco[i - 1].Name;
             }
         }
 
-        // Efface le nouveau nom et met le score
+        // Erase name and enter score
         Pref.Sco[NEdit].Score = Pref.Score;
         Pref.Sco[NEdit].Name.clear();
     }
 
-    // Met la sourie sur tous l'ecran
-    m_mouse.Init(Menu_Py); // Initialise la sourie
+    // Sets mouse on entire display
+    m_mouse.Init(Menu_Py);
     Menu_Py[0].StartX = 0;
     Menu_Py[0].StartY = 0;
     Menu_Py[0].EndX = 800;
@@ -1358,12 +1357,12 @@ eMenu Menu::SDLMain_Score(bool EditScore)
         SDL_StartTextInput();
     }
 
-    // Prend les evenements
+    // Fetch events
     do {
-        // Efface le background
+        // Erase background
         m_screen.CleanSpriteAndScreen(fmenu);
         SDL_RenderClear(sdlRenderer);
-        // Prend l'image du background et fait l'affichage
+        // Set background image and build display
         Sprites[background_menu].Draw(400, 300, 0, Sprites[fmenu].Image[0]);
 
         // Draw title and commands
@@ -1394,37 +1393,42 @@ eMenu Menu::SDLMain_Score(bool EditScore)
             m_screen.PrintText(Provi, 740 - m_screen.TextLength(std::string(Provi)), 120 + i * (360 / 7));
         }
 
-        // Efface le background
+        // Erase background
         SDL_Event event;
         while (SDL_PollEvent(&event)) {
-            m_mouse.GetEvent(event, PyE); // Handle mouse
-            m_gamepad.GetEvent(event); // Handle gamepad
+            m_mouse.GetEvent(event, PyE);
+            m_gamepad.GetEvent(event);
 
             switch (event.type) {
             case SDL_WINDOWEVENT:
                 if (event.window.event == SDL_WINDOWEVENT_ENTER) {
                     SDL_RenderPresent(sdlRenderer);
                 }
                 break;
-            case SDL_KEYDOWN: // Prend un touche au clavier
+            case SDL_KEYDOWN: // Waits a Keyboard press
                 if (event.key.state == SDL_PRESSED) {
                     if (NEdit >= 0 && event.key.keysym.sym == SDLK_BACKSPACE && !Pref.Sco[NEdit].Name.empty()) {
                         Pref.Sco[NEdit].Name.pop_back();
                     }
                     m_audio.Play(sClick);
+                    if (EditScore == false && event.key.keysym.sym != SDLK_F12) {
+                        event.key.keysym.sym = SDLK_RETURN;
+                    }
                     switch (event.key.keysym.sym) {
                     case SDLK_F12: // Save screenshot
                         if (event.key.repeat == 0) {
                             Utils::doScreenshot(sdlRenderer);
                         }
                         break;
-                    case SDLK_ESCAPE: // Valide l'entrée
+                    case SDLK_ESCAPE: // Validates entry
                     case SDLK_RETURN:
                     case SDLK_KP_ENTER:
                         if (EditScore) {
                             SDL_StopTextInput();
                         }
                         return mMenu;
+                    default:
+                        break;
                     }
                 }
                 break;
@@ -1441,7 +1445,7 @@ eMenu Menu::SDLMain_Score(bool EditScore)
             }
         }
 
-        // Gère les variables
+        // Handle variables
         previousTime = currentTime;
         currentTime = SDL_GetTicks();
         Sleeping();
@@ -1458,7 +1462,7 @@ eMenu Menu::SDLMain_Score(bool EditScore)
             m_screen.PrintSprite(arrow_right, i, 180 + textLen, 120 + NEdit * (360 / 7));
         }
 
-        // Echange les buffets video
+        // Update render
         SDL_RenderPresent(sdlRenderer);
 
     } while (true);

src/screen.cc

@@ -50,8 +50,6 @@ Screen::Screen()
 /******************/
 Screen::~Screen()
 {
-    // Destroying font
-    SDL_DestroyTexture(fontTexture);
     TTF_CloseFont(m_font);
 }
 
@@ -83,18 +81,21 @@ void Screen::ChangeFontColor(float r, float g, float b){
 /**********************/
 void Screen::PrintText(const std::string &Text, int x, int y)
 {
-    fontSurface = TTF_RenderUTF8_Blended(m_font, Text.c_str(), fColor); // Rendering text
-    fontTexture = SDL_CreateTextureFromSurface(sdlRenderer, fontSurface); // Creating texture
+    SDL_Texture *texture = nullptr;
+    SDL_Surface *surf = TTF_RenderUTF8_Blended(m_font, Text.c_str(), fColor);
+    texture = SDL_CreateTextureFromSurface(sdlRenderer, surf);
+    SDL_FreeSurface(surf);
 
     // Setting position and size
-    SDL_Rect dst;
-    dst.x = x;
-    dst.y = y;
-    dst.w = fontSurface->w;
-    dst.h = fontSurface->h;
+    SDL_Rect Position;
+    SDL_QueryTexture(texture, NULL, NULL, &Position.w, &Position.h);
+    Position.x = x;// - Position.w;
+    Position.y = y;// - Position.h;
+
 
     // Rendering text
-    SDL_RenderCopy(sdlRenderer, fontTexture, nullptr, &dst);
+    SDL_RenderCopy(sdlRenderer, texture, nullptr, &Position);
+    SDL_DestroyTexture(texture);
 }
 
 int Screen::TextLength(std::string Text){
@@ -105,7 +106,7 @@ int Screen::TextLength(std::string Text){
 
 /*** Display game settings ***/
 /*****************************/
-void Screen::PrintOptions(int NV, int NScore)
+void Screen::PrintOptions(int Nlives, int NScore)
 {
     int x, y;
 
@@ -114,14 +115,14 @@ void Screen::PrintOptions(int NV, int NScore)
     PrintText(std::to_string(Score), 740 - TextLength(std::to_string(Score))/2, 215);
     ChangeFontSize(22);
 
-    if (NV > 10) {
-        NV = 10; // Clamp to avoid going off screen
+    if (Nlives > 10) {
+        Nlives = 10; // Clamp to avoid going off screen
     }
-    for (int i = 0; i < NV; ++i) { // Display lives
+    for (int i = 0; i < Nlives; ++i) { // Display lives
         x = i % 2;
         x = x * 44 + 38 + LT * D_Case;
         y = i / 2;
-        y = 394 + y * 46;
+        y = 384 + y * 46;
         Sprites[logo_health].Draw(x, y, 0);
     }
 }

src/screen.h

@@ -25,12 +25,9 @@
 #define SCREEN_DOM_
 
 #include <SDL2/SDL_ttf.h>
-#include <SDL2/SDL_log.h>
-#include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_surface.h>
-#include <SDL2/SDL_timer.h>
+#include <string>
 #include "preference.h"
-#include "string"
 #include "sprite.h"
 
 class Screen
@@ -50,10 +47,8 @@ class Screen
 
 private:
     int Score { -1 }; // Stores displayed score
-    TTF_Font* m_font;
     SDL_Color fColor;
-    SDL_Surface* fontSurface;
-    SDL_Texture* fontTexture;
+    TTF_Font *m_font;
 };
 
 #endif

src/sprite.cc

@@ -226,49 +226,6 @@ int NumberLength(int C)
     return l;
 }
 
-/*** Returns the length of a string ***/
-/**************************************/
-int StringLength(char *Text)
-{
-    int i = 0;
-    int l = 0;
-    int Le;
-
-    while (Text[i] != 0) {
-        Le = (int)(Text[i]);
-        if (TextTable[Le] != -1) {
-            l += Sprites[letters].Dim[(TextTable[Le])].L;
-            if (Text[i + 1] != 0) {
-                l += GAP_BETWEEN_LETTERS;
-            }
-        }
-        else {
-            if (Le == (int)(' ')) {
-                l += SPACE_LENGTH;
-            }
-        }
-
-        i++;
-    }
-
-    return l;
-}
-
-/*** Checks if a char exists ***/
-/*******************************/
-bool CharExist(char C)
-{
-    if ((int)(C) < 0) {
-        return false;
-    }
-    if (C == ' ') {
-        return true;
-    }
-    if (TextTable[(int)(C)] != -1) {
-        return true;
-    }
-    return false;
-}
 /*** Displays a number ***/
 /*************************/
 void DrawNumber(int x, int y, int Number, SDL_Texture *Background)
@@ -283,31 +240,6 @@ void DrawNumber(int x, int y, int Number, SDL_Texture *Background)
     } while (Number);
 }
 
-/*** Display a string ***/
-/************************/
-void DrawString(int x, int y, const char *Text, SDL_Texture *background)
-{
-    int i = 0;
-    int Le;
-
-    // TODO Handle here unicode
-    while (Text[i] != 0) {
-        Le = (int)(Text[i]);
-
-        if (TextTable[Le] != -1) { // If known char
-            Le = TextTable[Le];
-            Sprites[letters].Draw(x + (Sprites[letters].Dim[Le].L / 2), y, Le, background);
-            x += Sprites[letters].Dim[Le].L + GAP_BETWEEN_LETTERS;
-        }
-        else { // if there's a space
-            if (Le == (int)(' ')) {
-                x += SPACE_LENGTH - GAP_BETWEEN_LETTERS;
-            }
-        }
-
-        i++;
-    }
-}
 
 /*** Display text in a language ***/
 /**********************************/

src/sprite.h

@@ -177,11 +177,8 @@ bool LoadLanguage(); // Loads sprites of a language
 bool LoadSprites(); // Loads all sprites
 
 int NumberLength(int C); // Returns the length in pixels of a number
-int StringLength(char *Text); // Returns the length in pixels of a string.
-bool CharExist(char C); // Checks if a character exists
 
 void DrawNumber(int x, int y, int Number, SDL_Texture *Background = nullptr); // Displays a number
-void DrawString(int x, int y, const char *Text, SDL_Texture *Background = nullptr); // Displays a string
 
 void DrawText(int x, int y, e_Sprite Text, SDL_Texture *Background = nullptr); // Displays a text in the language