hope that fixes it (again)

Encore-Developers · May 2, 2024 · 8e78662 · 8e78662
1 parent f334a41
commit 8e78662
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Encore/src/game/assets.cpp b/Encore/src/game/assets.cpp
@@ -20,7 +20,7 @@ Texture2D Assets::LoadTextureFilter(const std::filesystem::path &texturePath) {
 
 
 void Assets::MaterialMapper() {
-    player player;
+    Player player;
     smasherReg = LoadModel((directory / "Assets/highway/smasher.obj").string().c_str());
     smasherRegTex = Assets::LoadTextureFilter(directory / "Assets/highway/smasher_reg.png");
 

diff --git a/Encore/src/game/menu.cpp b/Encore/src/game/menu.cpp
@@ -37,7 +37,7 @@ void Menu::loadMenu(SongList songList, GLFWgamepadstatefun gamepadStateCallbackS
                 songi.artistScrollTime = GetTime();
                 songi.artistTextWidth = assets.MeasureTextRubik(songi.artist.c_str(), 20);
             }
-            currentScreen = SONG_SELECT;
+            Menu::SwitchScreen(SONG_SELECT);
         }
         if (GuiButton({((float) GetScreenWidth() / 2) - 100, ((float) GetScreenHeight() / 2) - 30, 200, 60},
                       "Options")) {