Split resources over folders, fix #94

richelbilderbeek · Jan 8, 2023 · c6da05c · c6da05c
1 parent d8040cc
commit c6da05c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/game_resources.qrc b/game_resources.qrc
@@ -65,7 +65,7 @@
         <file>resources/sound_effects/yes_mid.ogg</file>
         <file>resources/subtitle.png</file>
         <file>resources/t.png</file>
-        <file>resources/textures/lobby_menu/classic_head.png</file>
+        <file>resources/textures/lobby_menu/classic_head.jpg</file>
         <file>resources/textures/lobby_menu/protoss_head.jpg</file>
         <file>resources/textures/lobby_menu/terran_head.jpg</file>
         <file>resources/textures/lobby_menu/zerg_head.jpg</file>

diff --git a/lobby_menu_textures.cpp b/lobby_menu_textures.cpp
@@ -51,6 +51,13 @@ lobby_menu_textures::lobby_menu_textures()
   }
 }
 
+sf::Texture& lobby_menu_textures::get_color(
+  const chess_color c
+) noexcept
+{
+  return m_color[c];
+}
+
 std::string lobby_menu_textures::get_color_filename(
   const chess_color c
 ) const noexcept
@@ -69,6 +76,13 @@ std::string lobby_menu_textures::get_head_filename(
   return s.str();
 }
 
+sf::Texture& lobby_menu_textures::get_ready(
+  const bool b
+) noexcept
+{
+  return m_ready[b];
+}
+
 std::string lobby_menu_textures::get_ready_filename(
   const bool is_ready
 ) const noexcept

diff --git a/options_menu_textures.cpp b/options_menu_textures.cpp
@@ -15,7 +15,7 @@ options_menu_textures::options_menu_textures()
   {
     const std::string filename_str{get_filename(r)};
     const QString filename{filename_str.c_str()};
-    QFile f(":/resources/textures/game_options_menu/" + filename);
+    QFile f(":/resources/textures/options_menu/" + filename);
     f.copy(filename);
     if (!m_textures[r].loadFromFile(filename.toStdString()))
     {