Attachment #68462 for bug #83217

Lines 24-33 Link Here

(-)dc400b26-src/init.txt (-1 / +6 lines)
24	# name=kernel	24	# name=kernel
25		25
26		26
27	# Directory for reading macro.txt and init.txt, and dumping characters.	27	# Directory for reading macro.txt and init.txt.
28	# It should end with the path delimiter.	28	# It should end with the path delimiter.
29	# crawl_dir=/home/bwross/crawl/	29	# crawl_dir=/home/bwross/crawl/
30		30
		31	# Directory for dumping character files (morgue.txt)
		32	# Setting this different from crawl_dir allows configuration
		33	# to be in a separate directory.
		34	# It should end with the path delimiter.
		35	morgue_dir=/var/games/crawl/
31		36
32	# Here's a list of autopickup types:	37	# Here's a list of autopickup types:
33	#	38	#

Lines 847-853 Link Here

(-)dc400b26-src/source/chardump.cc (-1 / +3 lines)
847		847
848	char file_name[kPathLen] = "\0";	848	char file_name[kPathLen] = "\0";
849		849
850	if (SysEnv.crawl_dir)	850	if (SysEnv.morgue_dir)
		851	strncpy(file_name, SysEnv.morgue_dir, kPathLen);
		852	else if (SysEnv.crawl_dir)
851	strncpy(file_name, SysEnv.crawl_dir, kPathLen);	853	strncpy(file_name, SysEnv.crawl_dir, kPathLen);
852		854
853	strncat(file_name, fname, kPathLen);	855	strncat(file_name, fname, kPathLen);




        // some fields want capitals... none care about external spaces
        trim_string( field );
        if (key != "name" && key != "crawl_dir" 
            && key != "morgue_dir"
            && key != "race" && key != "class" && key != "ban_pickup"
            && key != "stop_travel" && key != "sound" 
            && key != "drop_filter")

                SysEnv.crawl_dir[ kNameLen - 1 ] = '\0';
            }
        }
        else if (key == "morgue_dir")
        {
            // We shouldn't bother to allocate this a second time
            // if the user puts two morgue_dir lines in the init file.
            if (!SysEnv.morgue_dir)
                SysEnv.morgue_dir = (char *) calloc(kPathLen, sizeof(char));

            if (SysEnv.morgue_dir)
            {
                strncpy(SysEnv.morgue_dir, field.c_str(), kNameLen - 1);
                SysEnv.morgue_dir[ kNameLen - 1 ] = '\0';
            }
        }
        else if (key == "race")
        {
            Options.race = str_to_race( field );

Lines 445-450 Link Here

(-)dc400b26-src/source/externs.h (+1 lines)
445	char *crawl_pizza;	445	char *crawl_pizza;
446	char *crawl_rc;	446	char *crawl_rc;
447	char *crawl_dir;	447	char *crawl_dir;
		448	char *morgue_dir;
448	char *home; // only used by MULTIUSER systems	449	char *home; // only used by MULTIUSER systems
449	bool board_with_nail; // Easter Egg silliness	450	bool board_with_nail; // Easter Egg silliness
450	};	451	};

Lines 62-69 Link Here

(-)dc400b26-src/source/macro.cc.bak (-2 / +2 lines)
62	{	62	{
63	std::string s;	63	std::string s;
64		64
65	if (SysEnv.crawl_dir)	65	if (SysEnv.morgue_dir)
66	s = SysEnv.crawl_dir;	66	s = SysEnv.morgue_dir;
67		67
68	return (s + "macro.txt");	68	return (s + "macro.txt");
69	}	69	}

Return to bug 83217

Lines 473-478 Link Here

(-)dc400b26-src/source/initfile.cc (+14 lines)
473	// some fields want capitals... none care about external spaces	473	// some fields want capitals... none care about external spaces
474	trim_string( field );	474	trim_string( field );
475	if (key != "name" && key != "crawl_dir"	475	if (key != "name" && key != "crawl_dir"
		476	&& key != "morgue_dir"
476	&& key != "race" && key != "class" && key != "ban_pickup"	477	&& key != "race" && key != "class" && key != "ban_pickup"
477	&& key != "stop_travel" && key != "sound"	478	&& key != "stop_travel" && key != "sound"
478	&& key != "drop_filter")	479	&& key != "drop_filter")
Lines 737-742 Link Here
737	SysEnv.crawl_dir[ kNameLen - 1 ] = '\0';	738	SysEnv.crawl_dir[ kNameLen - 1 ] = '\0';
738	}	739	}
739	}	740	}
		741	else if (key == "morgue_dir")
		742	{
		743	// We shouldn't bother to allocate this a second time
		744	// if the user puts two morgue_dir lines in the init file.
		745	if (!SysEnv.morgue_dir)
		746	SysEnv.morgue_dir = (char *) calloc(kPathLen, sizeof(char));
		747
		748	if (SysEnv.morgue_dir)
		749	{
		750	strncpy(SysEnv.morgue_dir, field.c_str(), kNameLen - 1);
		751	SysEnv.morgue_dir[ kNameLen - 1 ] = '\0';
		752	}
		753	}
740	else if (key == "race")	754	else if (key == "race")
741	{	755	{
742	Options.race = str_to_race( field );	756	Options.race = str_to_race( field );