fix settings adding repetitive default song paths

Encore-Developers · May 4, 2024 · 632360e · 632360e
1 parent 1b425c2
commit 632360e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Encore/include/game/settings.h b/Encore/include/game/settings.h
@@ -500,12 +500,9 @@ class Settings {
                     fullscreenError = true;
                 }
                 if (settings.HasMember("songDirectories") && settings["songDirectories"].IsArray()){
-
                         for (auto& songPath : settings["songDirectories"].GetArray()) {
                             songPaths.push_back(songPath.GetString());
                         }
-
-
                 } else {
                     songDirectoryError = true;
                 }
@@ -859,10 +856,10 @@ class Settings {
         missHighwayColorMember->value.SetBool(missHighwayDefault);
 		rapidjson::Value::MemberIterator mirrorMember = settings.FindMember("mirror");
 		mirrorMember->value.SetBool(mirrorMode);
-        rapidjson::Value::MemberIterator songDirMember = settings.FindMember("songDirectories");
-        songDirMember->value.Clear();
-		for (std::filesystem::path& path : songPaths)
-			songDirMember->value.PushBack(rapidjson::Value().SetString(path.string(), allocator), allocator);
+        // rapidjson::Value::MemberIterator songDirMember = settings.FindMember("songDirectories");
+        // songDirMember->value.Clear();
+		// for (std::filesystem::path& path : songPaths)
+        // songDirMember->value.PushBack(rapidjson::Value().SetString(path.string(), allocator), allocator);
 		rapidjson::Value::MemberIterator keybinds4KMember = settings["keybinds"].FindMember("4k");
 		keybinds4KMember->value.Clear();
 		for (int& key : keybinds4K)

diff --git a/Encore/src/game/menu.cpp b/Encore/src/game/menu.cpp
@@ -158,6 +158,8 @@ void Menu::showResults(const Player& player, Assets assets) {
     DrawBottomOvershell();
     DrawBottomBottomOvershell();
 
+
+
     float songNamePos = (float)GetScreenWidth()/2 - MeasureTextEx(assets.redHatDisplayBlack,player.songToBeJudged.title.c_str(), SongNameFontSize, 1).x/2;
     float bigScorePos = (float)GetScreenWidth()/2 - 15 - MeasureTextEx(assets.redHatDisplayItalicLarge,scoreCommaFormatter(player.score).c_str(), ScoreFontSize, 1).x;
     float bigStarPos = (float)GetScreenWidth()/2 + 140;

diff --git a/Encore/src/main.cpp b/Encore/src/main.cpp
@@ -595,8 +595,7 @@ int main(int argc, char* argv[])
                           (GetMonitorHeight(GetCurrentMonitor()) * 0.5) -
                           (GetMonitorHeight(GetCurrentMonitor()) * 0.375));
     } else {
-        SetWindowState(FLAG_WINDOW_UNDECORATED);
-        SetWindowState(FLAG_MSAA_4X_HINT);
+        SetWindowState(FLAG_WINDOW_UNDECORATED + FLAG_MSAA_4X_HINT);
         int CurrentMonitor = GetCurrentMonitor();
         SetWindowPosition(0, 0);
         SetWindowSize(GetMonitorWidth(CurrentMonitor), GetMonitorHeight(CurrentMonitor));