Minor more paths.

zardoru · Feb 11, 2016 · d6999f1 · d6999f1
1 parent 442f5e5
commit d6999f1
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/src/GameState.cpp b/src/GameState.cpp
@@ -227,7 +227,7 @@ Image* GameState::GetSkinImage(const std::string& Path)
                     if (Directory(File).GetExtension() == "ojn")
                     {
                         size_t read;
-                        const unsigned char* buf = reinterpret_cast<const unsigned char*>(LoadOJNCover(toLoad.u8string(), read));
+                        const unsigned char* buf = reinterpret_cast<const unsigned char*>(LoadOJNCover(toLoad, read));
                         ImageData data = ImageLoader::GetDataForImageFromMemory(buf, read);
                         StageImage->SetTextureData(&data, true);
                         delete[] buf;
@@ -237,7 +237,7 @@ Image* GameState::GetSkinImage(const std::string& Path)
 
                     if (File.length() && std::filesystem::exists(toLoad))
                     {
-                        StageImage->Assign(toLoad.u8string(), ImageData::SM_DEFAULT, ImageData::WM_DEFAULT, true);
+                        StageImage->Assign(toLoad, ImageData::SM_DEFAULT, ImageData::WM_DEFAULT, true);
                         return StageImage;
                     }
                     else return nullptr;
@@ -257,7 +257,7 @@ Image* GameState::GetSkinImage(const std::string& Path)
 
             if (SelectedSong->BackgroundFilename.length() && std::filesystem::exists(toLoad))
             {
-                SongBG->Assign(toLoad.u8string(), ImageData::SM_DEFAULT, ImageData::WM_DEFAULT, true);
+                SongBG->Assign(toLoad, ImageData::SM_DEFAULT, ImageData::WM_DEFAULT, true);
                 return SongBG;
             }
             else return nullptr;

diff --git a/src/GameWindow.cpp b/src/GameWindow.cpp
@@ -574,13 +574,22 @@ void GameWindow::AssignSize()
     if (WindowWidth == 0 || WindowHeight == 0)
     {
         GLFWmonitor *mon = glfwGetPrimaryMonitor();
-        const GLFWvidmode *mode = glfwGetVideoMode(mon);
 
-        size.x = mode->width;
-        size.y = mode->height;
+		if (mon) {
+			const GLFWvidmode *mode = glfwGetVideoMode(mon);
+
+			size.x = mode->width;
+			size.y = mode->height;
+		}
+		else {
+			WindowWidth = 1024;
+			WindowHeight = 768;
+			goto autosize;
+		}
     }
     else
     {
+		autosize:
         size.x = WindowWidth;
         size.y = WindowHeight;
     }

diff --git a/src/NoteLoader7K.h b/src/NoteLoader7K.h
@@ -28,7 +28,7 @@ namespace NoteLoaderOM
     void LoadObjectsFromFile(std::filesystem::path filename, VSRG::Song *Out);
 }
 
-const char *LoadOJNCover(std::string filename, size_t &read);
+const char *LoadOJNCover(std::filesystem::path filename, size_t &read);
 namespace NoteLoaderOJN
 {
     void LoadObjectsFromFile(std::filesystem::path filename, VSRG::Song *Out);

diff --git a/src/NoteLoaderOJN.cpp b/src/NoteLoaderOJN.cpp
@@ -294,13 +294,9 @@ bool IsValidOJN(std::fstream &filein, OjnHeader *Head)
     return true;
 }
 
-const char *LoadOJNCover(std::string filename, size_t &read)
+const char *LoadOJNCover(std::filesystem::path filename, size_t &read)
 {
-#if (!defined _WIN32)
-    std::fstream filein(filename.c_str());
-#else
-    std::fstream filein(Utility::Widen(filename).c_str(), std::ios::binary | std::ios::in);
-#endif
+    std::fstream filein(filename, std::ios::binary | std::ios::in);
     OjnHeader Head;
     char* out;
 

diff --git a/src/SongList.cpp b/src/SongList.cpp
@@ -51,7 +51,7 @@ void SongList::AddNamedDirectory(std::mutex &loadMutex, SongLoader *Loader, std:
             Loader->LoadSong7KFromDir(i, Songs7K);
 
         if (DotcurActive)
-            Loader->LoadSongDCFromDir(i.path().u8string(), SongsDC);
+            Loader->LoadSongDCFromDir(i.path().string(), SongsDC);
 
         if (!SongsDC.size() && !Songs7K.size()) // No songs, so, time to recursively search.
         {
@@ -121,10 +121,7 @@ void SongList::AddNamedDirectory(std::mutex &loadMutex, SongLoader *Loader, std:
 
 void SongList::AddDirectory(std::mutex &loadMutex, SongLoader *Loader, std::filesystem::path Dir, bool VSRGActive, bool DotcurActive)
 {
-    int idx = Dir.u8string().find_last_of('/') + 1;
-    std::string path;
-	path = Dir.filename().u8string();
-    AddNamedDirectory(loadMutex, Loader, Dir, path, VSRGActive, DotcurActive);
+    AddNamedDirectory(loadMutex, Loader, Dir, Utility::Narrow(Dir.filename()), VSRGActive, DotcurActive);
 }
 
 void SongList::AddVirtualDirectory(std::string NewEntryName, Game::Song* List, int Count)

diff --git a/src/Sprite.cpp b/src/Sprite.cpp
@@ -145,7 +145,7 @@ void Sprite::BindTextureVBO()
 std::string Sprite::GetImageFilename() const
 {
     if (mImage)
-        return mImage->fname.u8string();
+        return Utility::Narrow(mImage->fname);
     else
         return std::string();
 }