fiddlerwoaroof/crawl - Change EWJXUTTGMQTA6Q7ITOYVBPIWMZ55LBHXTLYCEV4YCFPS7DRCJ7GQC

Added morgue_dir as an init.txt option.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@718 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on December 29, 2006

EWJXUTTGMQTA6Q7ITOYVBPIWMZ55LBHXTLYCEV4YCFPS7DRCJ7GQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/macro.cc at line 173 [3.2457534]

B:BD[3.2459187] → [2.793:865]

    if (SysEnv.macro_file.length())
        return (SysEnv.macro_file);

[3.2459187]

[3.2459206]

    std::string dir =
        !Options.macro_dir.empty()? Options.macro_dir :
        SysEnv.crawl_dir?           SysEnv.crawl_dir : "";

Replacement in crawl-ref/source/macro.cc at line 177 [3.2457534]

B:BD[3.2459211] → [2.866:927]

∅:D[2.927] → [3.2459272:2459302]

B:BD[3.2459272] → [3.2459272:2459302]

    std::string s = SysEnv.crawl_dir? SysEnv.crawl_dir : "";
    return (s + "macro.txt");

[3.2459211]

[3.2459302]

    if (!dir.empty())
    {
        if (dir[dir.length() - 1] != FILE_SEPARATOR)
            dir += FILE_SEPARATOR;
    }
    
    return (dir + "macro.txt");

Insertion in crawl-ref/source/initfile.cc at line 1621 [3.2957258]

[4.803596]

[5.414335]

    else if (key == "morgue_dir")
    {
        if (morgue_dir.empty())
            morgue_dir = field;
    }

Replacement in crawl-ref/source/initfile.cc at line 2340 [3.2957258]

B:BD[2.1369] → [2.1369:1415]

                SysEnv.macro_file = next_arg;

[2.1369]

[2.1415]

                Options.macro_dir = next_arg;

Replacement in crawl-ref/source/initfile.cc at line 2348 [3.2957258]

B:BD[2.1579] → [2.1579:1625]

                SysEnv.morgue_dir = next_arg;

[2.1579]

[2.1625]

                Options.morgue_dir = next_arg;

Deletion in crawl-ref/source/externs.h at line 718 [3.3270163]

B:BD[6.2273] → [2.1956:2177]

    std::string macro_file;     // File to read instead of macro.txt
    std::string morgue_dir;     // Directory where character dumps and morgue
                                // dumps are saved. Overrides crawl_dir.

Insertion in crawl-ref/source/externs.h at line 789 [3.3270163]

[4.898566]

[5.443316]

    std::string macro_dir;      // Directory containing macro.txt
    std::string morgue_dir;     // Directory where character dumps and morgue
                                // dumps are saved. Overrides crawl_dir.

Replacement in crawl-ref/source/chardump.cc at line 966 [3.4100336]

B:BD[2.2273] → [2.2273:2388]

        !SysEnv.morgue_dir.empty()? SysEnv.morgue_dir :
        SysEnv.crawl_dir          ? SysEnv.crawl_dir : "";

[2.2273]

[2.2388]

        !Options.morgue_dir.empty()? Options.morgue_dir :
        SysEnv.crawl_dir           ? SysEnv.crawl_dir : "";