From: malak585 <malak585@tlvm-4-3-3.ad.liu.se>
Date: Tue, 28 Nov 2023 12:32:31 +0000 (+0100)
Subject: merging
X-Git-Url: https://gitweb.forssennils.se/?a=commitdiff_plain;h=b4ef2086a11e7a763c7bc0f28ddf44f7a659773e;p=TDDC76_proj.git

merging
---

b4ef2086a11e7a763c7bc0f28ddf44f7a659773e
diff --cc src/Menus.cc
index 6fc0b5b,9fa2cf2..589dc58
--- a/src/Menus.cc
+++ b/src/Menus.cc
@@@ -334,10 -338,12 +338,10 @@@ void Pause_menu::handle_input(sf::Event
  
  
  // Scoreboard menu --------------------------------------------
- Scoreboard_menu::Scoreboard_menu() : texture{}, texture2{}, sprite{}, menu{false}, exit_game{false}, 
-                                  scoreboardtext{}, firstplacetext{}, startmenutext{}, quittext{}, mouse_r{}, mouse_l{}, font{}, menu_index{1}
 -Scoreboard_menu::Scoreboard_menu() : /*texture{},*/ texture2{}, /*sprite{},*/ mouse_l{}, mouse_r{}, startmenutext{},
 -                                     quittext{}, font{}, exit_game{false}, menu{false}, menu_index{1}
++Scoreboard_menu::Scoreboard_menu() : /*texture{},*/ texture2{}, /*sprite{},*/ menu{false}, exit_game{false}, 
++                                 startmenutext{}, quittext{}, mouse_r{}, mouse_l{}, font{}, menu_index{1}
  {
 -    // Add background later
 -    /*
 -    texture.loadFromFile("assets/Pause_bild.png");
 +    texture.loadFromFile("assets/scoreboard.png");
      sprite.setTexture(texture);;
  
      sprite.setScale(S_SCALE_KOEFF, S_SCALE_KOEFF);