Attachment #237821 for bug #326961

Lines 915-921 Link Here

(-)wl_def.h.orig (-1 / +2 lines)
915		915
916	extern boolean startgame;	916	extern boolean startgame;
917	extern char str[80];	917	extern char str[80];
918	extern char configname[13];	918	extern char configdir[64];
		919	extern char configname[78];
919		920
920	//	921	//
921	// Command line parameter variables	922	// Command line parameter variables

Lines 73-79 Link Here

(-)wl_main.cpp.orig (-1 / +8 lines)
73	boolean loadedgame;	73	boolean loadedgame;
74	int mouseadjustment;	74	int mouseadjustment;
75		75
76	char configname[13]="config.";	76	char configdir[64];
		77	char configname[78];
77		78
78	//	79	//
79	// Command line parameter variables	80	// Command line parameter variables
Lines 247-252 Link Here
247	fs_unlink(configname);	248	fs_unlink(configname);
248	#endif	249	#endif
249		250
		251	// Ensure configdir exists and create if necessary
		252	struct stat st;
		253	if (stat(configdir, &st) != 0) {
		254	mkdir(configdir, 0755);
		255	}
		256
250	const int file = open(configname, O_CREAT \| O_WRONLY \| O_BINARY, 0644);	257	const int file = open(configname, O_CREAT \| O_WRONLY \| O_BINARY, 0644);
251	if (file != -1)	258	if (file != -1)
252	{	259	{




{
    struct stat statbuf;

// Set config location to home directory for multi-user support
// Also support separate configuration files for wolf3d and sod
strcpy(configdir, getenv("HOME"));
strcat(configdir, "/.wolf4sdl");
#ifdef SPEAR
	strcpy(configname, configdir);
	strcat(configname, "/spear.");
#else
	strcpy(configname, configdir);
	strcat(configname, "/wolf3d.");
#endif

//
// JAPANESE VERSION
//

Return to bug 326961

Lines 3993-3998 Link Here

(-)wl_menu.cpp.orig (+12 lines)
3993	{	3993	{
3994	struct stat statbuf;	3994	struct stat statbuf;
3995		3995
		3996	// Set config location to home directory for multi-user support
		3997	// Also support separate configuration files for wolf3d and sod
		3998	strcpy(configdir, getenv("HOME"));
		3999	strcat(configdir, "/.wolf4sdl");
		4000	#ifdef SPEAR
		4001	strcpy(configname, configdir);
		4002	strcat(configname, "/spear.");
		4003	#else
		4004	strcpy(configname, configdir);
		4005	strcat(configname, "/wolf3d.");
		4006	#endif
		4007
3996	//	4008	//
3997	// JAPANESE VERSION	4009	// JAPANESE VERSION
3998	//	4010	//