Package: uhexen2 / 1.5.6+dfsg-1

debian-paths Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Description: this patch changes the default search path for uhexen2 executables
Origin: vendor
Forwarded: not-needed
Last-Update: <2012-09-16>

--- a/engine/hexenworld/client/sys_unix.c
+++ b/engine/hexenworld/client/sys_unix.c
@@ -648,7 +648,7 @@ int main (int argc, char **argv)
 
 	/* initialize the host params */
 	memset (&parms, 0, sizeof(parms));
-	parms.basedir = cwd;
+	parms.basedir = "/usr/share/games/hexen2";
 #if DO_USERDIRS
 	parms.userdir = userdir;
 #else
--- a/engine/hexenworld/server/sys_unix.c
+++ b/engine/hexenworld/server/sys_unix.c
@@ -541,7 +541,7 @@ int main (int argc, char **argv)
 
 	/* initialize the host params */
 	memset (&parms, 0, sizeof(parms));
-	parms.basedir = cwd;
+	parms.basedir = "/usr/share/games/hexen2";
 #if DO_USERDIRS
 	parms.userdir = userdir;
 #else
--- a/engine/hexen2/sys_unix.c
+++ b/engine/hexen2/sys_unix.c
@@ -895,7 +895,7 @@ int main (int argc, char **argv)
 
 	/* initialize the host params */
 	memset (&parms, 0, sizeof(parms));
-	parms.basedir = cwd;
+	parms.basedir = "/usr/share/games/hexen2";
 #if DO_USERDIRS
 	parms.userdir = userdir;
 #else
--- a/engine/hexen2/server/sys_unix.c
+++ b/engine/hexen2/server/sys_unix.c
@@ -582,7 +582,7 @@ int main (int argc, char **argv)
 
 	/* initialize the host params */
 	memset (&parms, 0, sizeof(parms));
-	parms.basedir = cwd;
+	parms.basedir = "/usr/share/games/hexen2";
 #if DO_USERDIRS
 	parms.userdir = userdir;
 #else
--- a/launcher/config_file.c
+++ b/launcher/config_file.c
@@ -30,7 +30,7 @@
 
 /* Default values for the options */
 char game_basedir[MAX_OSPATH]	= GAME_DATADIR;
-int basedir_nonstd	= 0;
+int basedir_nonstd	= 1;
 int destiny		= DEST_H2;
 int opengl_support	= 1;
 int fullscreen		= 1;
@@ -145,7 +145,6 @@ int cfg_read_basedir (void)
 	char	buff[1024], *tmp;
 	int	cnt;
 
-	game_basedir[0] = '\0';
 	cfg_file = open_config_file("r");
 	if (cfg_file == NULL)
 	{