diff options
author | Jan Cholasta | 2020-06-08 12:17:52 +0200 |
---|---|---|
committer | Jan Cholasta | 2020-06-08 12:17:52 +0200 |
commit | c479a6029df2d5b9df2cc8ef80c72f16be5d6d32 (patch) | |
tree | 128ea881663c5170daaa18c11e9b77107e4bdc83 /0001-Fix-file-paths.patch | |
parent | 22f06efab8ede0ab9526b441b841894c4641ba57 (diff) | |
download | aur-c479a6029df2d5b9df2cc8ef80c72f16be5d6d32.tar.gz |
raze-git-0.6.0+485+g5330964a7-1
Diffstat (limited to '0001-Fix-file-paths.patch')
-rw-r--r-- | 0001-Fix-file-paths.patch | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch index d27ade9c332a..cc8b05379972 100644 --- a/0001-Fix-file-paths.patch +++ b/0001-Fix-file-paths.patch @@ -1,13 +1,13 @@ -From 125e3293d068aa641dd29d4b51f8c37b6f464884 Mon Sep 17 00:00:00 2001 +From a8beb39ac0babaa9516a9888b35d1bfe657c0747 Mon Sep 17 00:00:00 2001 From: Jan Cholasta <jan@cholasta.net> Date: Thu, 6 Feb 2020 07:59:18 +0100 Subject: [PATCH] Fix file paths --- - source/common/audio/music/i_soundfont.cpp | 4 +--- - source/core/gameconfigfile.cpp | 13 +------------ - source/core/gamecontrol.cpp | 2 +- - source/platform/posix/sdl/i_main.cpp | 14 +------------- + source/common/audio/music/i_soundfont.cpp | 4 +--- + source/common/platform/posix/sdl/i_main.cpp | 14 +------------- + source/core/gameconfigfile.cpp | 13 +------------ + source/core/gamecontrol.cpp | 2 +- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/source/common/audio/music/i_soundfont.cpp b/source/common/audio/music/i_soundfont.cpp @@ -25,8 +25,33 @@ index a8b4e9fdf..911b8e308 100644 }; #else const char *paths[] = { +diff --git a/source/common/platform/posix/sdl/i_main.cpp b/source/common/platform/posix/sdl/i_main.cpp +index 7fc179a51..fb4ce733e 100644 +--- a/source/common/platform/posix/sdl/i_main.cpp ++++ b/source/common/platform/posix/sdl/i_main.cpp +@@ -129,19 +129,7 @@ int main (int argc, char **argv) + Args = new FArgs(argc, argv); + + // Should we even be doing anything with progdir on Unix systems? +- char program[PATH_MAX]; +- if (realpath (argv[0], program) == NULL) +- strcpy (program, argv[0]); +- char *slash = strrchr (program, '/'); +- if (slash != NULL) +- { +- *(slash + 1) = '\0'; +- progdir = program; +- } +- else +- { +- progdir = "./"; +- } ++ progdir = "/usr/lib/raze/"; + + I_StartupJoysticks(); + diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp -index dd4c0889e..ae7d282d4 100644 +index b532b2925..8ffd663b1 100644 --- a/source/core/gameconfigfile.cpp +++ b/source/core/gameconfigfile.cpp @@ -100,15 +100,10 @@ FGameConfigFile::FGameConfigFile () @@ -70,10 +95,10 @@ index dd4c0889e..ae7d282d4 100644 } diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp -index d5650c85a..7f2ae609b 100644 +index 92b6c47ae..1d8bf338c 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp -@@ -639,7 +639,7 @@ int RunGame() +@@ -749,7 +749,7 @@ int RunGame() FString logfile = Args->TakeValue("+logfile"); // As long as this engine is still in prerelease mode let's always write a log file. @@ -82,31 +107,6 @@ index d5650c85a..7f2ae609b 100644 if (logfile.IsNotEmpty()) { -diff --git a/source/platform/posix/sdl/i_main.cpp b/source/platform/posix/sdl/i_main.cpp -index e593963ac..314f757fa 100644 ---- a/source/platform/posix/sdl/i_main.cpp -+++ b/source/platform/posix/sdl/i_main.cpp -@@ -124,19 +124,7 @@ int main (int argc, char **argv) - Args = new FArgs(argc, argv); - - // Should we even be doing anything with progdir on Unix systems? -- char program[PATH_MAX]; -- if (realpath (argv[0], program) == NULL) -- strcpy (program, argv[0]); -- char *slash = strrchr (program, '/'); -- if (slash != NULL) -- { -- *(slash + 1) = '\0'; -- progdir = program; -- } -- else -- { -- progdir = "./"; -- } -+ progdir = "/usr/lib/raze/"; - - I_StartupJoysticks(); - -- -2.26.0 +2.27.0 |