summaryrefslogtreecommitdiffstats
path: root/games/bstone/datadir.diff
diff options
context:
space:
mode:
Diffstat (limited to 'games/bstone/datadir.diff')
-rw-r--r--games/bstone/datadir.diff45
1 files changed, 28 insertions, 17 deletions
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index 2825740952..268c10e3c1 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,25 +1,36 @@
-diff -Naur bstone-1.1.8/src/3d_main.cpp bstone-1.1.8.patched/src/3d_main.cpp
---- bstone-1.1.8/src/3d_main.cpp 2017-08-06 06:52:35.000000000 -0400
-+++ bstone-1.1.8.patched/src/3d_main.cpp 2017-08-07 12:33:38.268538355 -0400
-@@ -9658,20 +9658,7 @@
+diff -Naur bstone-1.2.11/src/3d_main.cpp bstone-1.2.11.patched/src/3d_main.cpp
+--- bstone-1.2.11/src/3d_main.cpp 2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/3d_main.cpp 2021-10-04 19:12:08.818938051 -0400
+@@ -10711,20 +10711,7 @@
const std::string& get_default_data_dir()
{
-- static std::string result;
-- static auto is_initialized = false;
+- static std::string result;
+- static auto is_initialized = false;
-
-- if (!is_initialized) {
-- is_initialized = true;
+- if (!is_initialized)
+- {
+- is_initialized = true;
-
-- auto sdl_dir = ::SDL_GetBasePath();
+- result = bstone::file_system::get_working_dir();
-
-- if (sdl_dir) {
-- result = sdl_dir;
-- ::SDL_free(sdl_dir);
-- }
-- }
+-#ifdef __vita__
+- result = "ux0:/data/bstone/";
+-#endif
+- }
-
-+ static std::string result = "/usr/share/games/bstone/";
- return result;
++ static std::string result = "/usr/share/games/bstone/";
+ return result;
}
- // BBi
+
+diff -Naur bstone-1.2.11/src/jm_free.cpp bstone-1.2.11.patched/src/jm_free.cpp
+--- bstone-1.2.11/src/jm_free.cpp 2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/jm_free.cpp 2021-10-04 19:12:39.570935256 -0400
+@@ -718,6 +718,7 @@
+ bstone::file_system::get_working_dir());
+
+ add_search_path("working dir", working_full_dir, search_paths);
++ add_search_path("system dir", "/usr/share/games/bstone", search_paths);
+ }
+
+ {