From 94c531bd05ab6b49996113faff9584cb6b534b9c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 19 Mar 2023 02:12:05 +0100
Subject: loader: chdir to share/floormat

---
 loader/filesystem.cpp | 3 ++-
 loader/loader.cpp     | 7 ++++---
 loader/loader.hpp     | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'loader')

diff --git a/loader/filesystem.cpp b/loader/filesystem.cpp
index b86915d4..a7926da1 100644
--- a/loader/filesystem.cpp
+++ b/loader/filesystem.cpp
@@ -75,7 +75,8 @@ void loader_impl::set_application_working_directory()
             if (c == '/')
                 c = '\\';
 #endif
-        chdir(path);
+        chdir(path) &&
+        chdir("share/floormat"_s);
     }
     else
         fm_warn("can't find install prefix!");
diff --git a/loader/loader.cpp b/loader/loader.cpp
index e9401385..eccfb350 100644
--- a/loader/loader.cpp
+++ b/loader/loader.cpp
@@ -33,8 +33,9 @@ StringView loader_::strip_prefix(StringView name)
     return name;
 }
 
-const StringView loader_::IMAGE_PATH = "share/floormat/images/"_s;
-const StringView loader_::ANIM_PATH = "share/floormat/anim/"_s;
-const StringView loader_::SCENERY_PATH = "share/floormat/scenery/"_s;
+const StringView loader_::IMAGE_PATH = "images/"_s;
+const StringView loader_::ANIM_PATH = "anim/"_s;
+const StringView loader_::SCENERY_PATH = "scenery/"_s;
+const StringView loader_::TEMP_PATH = "../../../"_s;
 
 } // namespace floormat
diff --git a/loader/loader.hpp b/loader/loader.hpp
index e81abadf..f2617f04 100644
--- a/loader/loader.hpp
+++ b/loader/loader.hpp
@@ -41,6 +41,7 @@ struct loader_
     static const StringView IMAGE_PATH;
     static const StringView ANIM_PATH;
     static const StringView SCENERY_PATH;
+    static const StringView TEMP_PATH;
 
 protected:
     loader_();
-- 
cgit v1.2.3