fix song paths issue

Encore-Developers · May 2, 2024 · a6c0e61 · a6c0e61
1 parent fd2c764
commit a6c0e61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Encore/include/game/settings.h b/Encore/include/game/settings.h
@@ -833,8 +833,8 @@ class Settings {
 		mirrorMember->value.SetBool(mirrorMode);
         rapidjson::Value::MemberIterator songDirMember = settings.FindMember("songDirectories");
         songDirMember->value.Clear();
-        for (filesystem::path &path: songPaths)
-            songDirMember->value.PushBack(rapidjson::Value().SetString((const char*)(path.c_str()), allocator), allocator);
+		for (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/include/rapidjson/rapidjson.h b/Encore/include/rapidjson/rapidjson.h
@@ -14,7 +14,7 @@
 
 #ifndef RAPIDJSON_RAPIDJSON_H_
 #define RAPIDJSON_RAPIDJSON_H_
-
+#define RAPIDJSON_HAS_STDSTRING 1
 /*!\file rapidjson.h
     \brief common definitions and configuration
 

diff --git a/Encore/src/main.cpp b/Encore/src/main.cpp
@@ -1016,7 +1016,7 @@ int main(int argc, char* argv[])
 				curBPM = 0;
 				instrument = 0;
 				diff = 0;
-                int randSong = rand()%(songList.songCount-0+1)+0;
+                static int randSong = rand()%songList.songCount;
                 int selectedSongInt = curPlayingSong;
                 Song selectedSong = songList.songs[selectedSongInt];
 
@@ -1165,7 +1165,7 @@ int main(int argc, char* argv[])
                     }
                 }
                 DrawBottomBottomOvershell();
-                break
+				break;
 			}
 			case INSTRUMENT_SELECT: {
                 selSong = false;