delete, erori

headers/Erori.h

@@ -16,4 +16,14 @@ class eroare_fereastra : public std::runtime_error {
     explicit eroare_fereastra(const std::string& mesaj);
 };
 
+class eroare_imagine : public eroare_fereastra {
+public:
+    [[maybe_unused]] explicit eroare_imagine(const std::string& mesaj);
+};
+
+class eroare_font : public eroare_fereastra {
+public:
+    explicit eroare_font(const std::string& mesaj);
+};
+
 #endif //OOP_ERORI_H

headers/Game.h

@@ -16,7 +16,7 @@
 
 class Game {
 private:
-    Screen *startScreen;
+    Screen *startScreen{};
     std::vector<Screen *> questions;
     std::vector<Player> players;
 
@@ -38,7 +38,8 @@ class Game {
     void addPlayer(const Player& player);
 
     void play();
-};
 
+    virtual ~Game();
+};
 
 #endif //OOP_GAME_H

headers/Question.h

@@ -10,6 +10,7 @@
 #include "Button.h"
 #include "SFML/Graphics.hpp"
 #include "Timer.h"
+#include "Erori.h"
 
 class Screen {
     std::string text;
@@ -20,11 +21,12 @@ class Screen {
 
     friend std::ostream& operator<<(std::ostream& os, const Screen& screen);
 
-    virtual int display(sf::RenderWindow &window);
+    virtual int display(sf::RenderWindow &window) = 0;
 
     [[nodiscard]] std::basic_string<char> getText() const;
     [[nodiscard]] std::vector<Button> getOptions() const;
 
+    virtual ~Screen();
 
 };
 

main.cpp

@@ -2,14 +2,11 @@
 
 #include "headers/Player.h"
 #include "headers/Timer.h"
-#include "headers/Question.h"
-#include "headers/Button.h"
 #include "headers/Game.h"
 
 int main(){
 
     Player p1("A");
-    Player p2("Maria");
     std::vector<Player> players;
 
 

src/Erori.cpp

@@ -8,4 +8,10 @@ eroare_fisier::eroare_fisier(const std::string& mesaj) :
     std::runtime_error("eroare fisier: " + mesaj) {}
 
 eroare_fereastra::eroare_fereastra(const std::string& mesaj) :
-    std::runtime_error("eroare fereastra: " + mesaj) {}
+    std::runtime_error("eroare fereastra: " + mesaj) {}
+
+eroare_imagine::eroare_imagine(const std::string& mesaj) :
+    eroare_fereastra("Nu a fost gasita o imagine " + mesaj) {}
+
+eroare_font::eroare_font(const std::string& mesaj) :
+    eroare_fereastra("Nu a fost gasit fontul" + mesaj) {}

src/Game.cpp

@@ -78,10 +78,9 @@ void Game::play(){
             if (categorie_aleasa != -1) {
                 bool quit2 = false;
                 while(!quit2 and window.isOpen()) {
-                    Timer clock(12);
+                    Timer clock(300);
                     clock.reset();
                     int number = 0;
-
                     std::vector<Question *> category_questions;
                     for (auto question: questions) {
                         if (categorie_aleasa == dynamic_cast<Question *>(question)->getCategory()) {
@@ -183,9 +182,18 @@ void Game::play(){
                                 }
                             }
                         }
+                        delete screen;
                     }
                 }
             }
         }
     }
 }
+Game::~Game() {
+    delete startScreen;
+    for (auto q : questions) {
+        delete q;
+    }
+}
+
+

src/Question.cpp

@@ -91,6 +91,8 @@ std::vector<Button> Screen::getOptions() const {
     return options;
 }
 
+Screen::~Screen() = default;
+
 Question::Question(std::string question, const std::vector<std::string>& options, const int correct, const int category_):
         Screen(std::move(question), options), correctAnswerIndex(correct), category(category_){
 }
@@ -115,23 +117,37 @@ std::ostream& operator<<(std::ostream& os, const Question& question) {
 
 
 int Question::display(sf::RenderWindow &window) {
-    // Load background image and button texture
     sf::Texture background;
-    background.loadFromFile("background.jpg");
+    try {
+        background.loadFromFile("background.jpg");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
     sf::Sprite background_sprite;
     background_sprite.setTexture(background);
 
     sf::Texture texture;
-    texture.loadFromFile("button2.png");
 
-    // Create button sprite and set its position
+    try {
+        texture.loadFromFile("button2.png");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
+
     sf::Sprite box;
     box.setTexture(texture);
     box.setPosition(100, 100);
 
-    // Load font and create text object
+
     sf::Font font;
-    font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
+    try {
+        font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
+    }
+    catch(eroare_font &er){
+        std::cout << er.what() << std::endl;
+    }
 
     sf::Text text_;
     text_.setString(this -> getText());
@@ -179,20 +195,34 @@ MenuScreen &MenuScreen::operator=(const MenuScreen &other) = default;
 
 int MenuScreen::display(sf::RenderWindow &window) {
     sf::Texture background;
-    background.loadFromFile("background.jpg");
+    try {
+        background.loadFromFile("background.jpg");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
     sf::Sprite background_sprite;
     background_sprite.setTexture(background);
 
     sf::Sprite box;
     sf::Texture texture;
-    texture.loadFromFile("button2.png");
+    try {
+        texture.loadFromFile("button2.png");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
     box.setTexture(texture);
     box.setPosition(100, 100);
 
     sf::Text text_;
     sf::Font font;
-    font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
-
+    try {
+        font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
+    }
+    catch(eroare_font &er){
+        std::cout << er.what() << std::endl;
+    }
     text_.setString(getText());
     text_.setCharacterSize(20);
     text_.setFont(font);
@@ -206,8 +236,7 @@ int MenuScreen::display(sf::RenderWindow &window) {
     while(window.isOpen())
     {
         sf::Event e{};
-        while(window.pollEvent(e))
-        {
+        while(window.pollEvent(e)){
             if(e.type == sf::Event::Closed)
                 window.close();
         }
@@ -234,19 +263,34 @@ CategoryScreen::CategoryScreen(const CategoryScreen &other) = default;
 CategoryScreen &CategoryScreen::operator=(const CategoryScreen &other) = default;
 int CategoryScreen::display(sf::RenderWindow &window) {
     sf::Texture background;
-    background.loadFromFile("background.jpg");
+    try {
+        background.loadFromFile("background.jpg");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
     sf::Sprite background_sprite;
     background_sprite.setTexture(background);
 
     sf::Sprite box;
     sf::Texture texture;
-    texture.loadFromFile("button2.png");
+    try {
+        texture.loadFromFile("button2.png");
+    }
+    catch(eroare_imagine &er){
+        std::cout << er.what() << std::endl;
+    }
     box.setTexture(texture);
     box.setPosition(100, 100);
 
     sf::Text text_;
     sf::Font font;
-    font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
+    try {
+        font.loadFromFile(R"(C:\Windows\Fonts\arial.ttf)");
+    }
+    catch(eroare_font &er){
+        std::cout << er.what() << std::endl;
+    }
 
     text_.setString(getText());
     text_.setCharacterSize(20);
@@ -261,8 +305,7 @@ int CategoryScreen::display(sf::RenderWindow &window) {
     while(window.isOpen())
     {
         sf::Event e{};
-        while(window.pollEvent(e))
-        {
+        while(window.pollEvent(e)){
             if(e.type == sf::Event::Closed)
                 window.close();
         }