1 files changed, 14 insertions, 25 deletions
diff --git a/pcr/odamex/0001-Fix-WAD-path.patch b/pcr/odamex/0001-Fix-WAD-path.patch
index 00926cc62..12b485ac8 100644
--- a/pcr/odamex/0001-Fix-WAD-path.patch
+++ b/pcr/odamex/0001-Fix-WAD-path.patch
@@ -1,25 +1,14 @@
-From 02dcf788ba288ddebb7164b86aef22e0e5fbf96a Mon Sep 17 00:00:00 2001
-From: Mikael Eriksson <mikael_eriksson@miffe.org>
-Date: Mon, 17 Dec 2012 12:04:02 +0100
-Subject: [PATCH] Fix WAD path
-
----
- common/d_main.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/common/d_main.cpp b/common/d_main.cpp
-index a31cb62..4abf6be 100644
---- a/common/d_main.cpp
-+++ b/common/d_main.cpp
-@@ -490,6 +490,8 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
- 	dirs.push_back(progdir);
- 
- 	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
-+	D_AddSearchDir(dirs, "/usr/share/odamex", separator);
-+	D_AddSearchDir(dirs, "/usr/share/doom", separator);
- 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
- 	D_AddSearchDir(dirs, getenv("HOME"), separator);
--- 
-1.8.0.2
-
+diff --unified --recursive --text odamex-src-0.8.0/common/d_main.cpp "odamex-src-0.8.0 diff/common/d_main.cpp"
+--- odamex-src-0.8.0/common/d_main.cpp	2019-01-23 04:01:47.000000000 +0100
++++ "odamex-src-0.8.0 diff/common/d_main.cpp"	2019-03-07 22:31:46.807985980 +0100
+@@ -499,6 +499,8 @@
+ 	dirs.push_back(progdir);
+ 
+ 	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
++	D_AddSearchDir(dirs, "/usr/share/odamex", separator);
++	D_AddSearchDir(dirs, "/usr/share/doom", separator);
+ 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
+ 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
+ 	D_AddSearchDir(dirs, getenv("HOME"), separator);
+ 
+ VERSION_CONTROL (d_main_cpp, "$Id: cc97705a3130a984ef22d249de74a1dc64ba33a8 $")