fiddlerwoaroof/crawl - Change GSQ72ULBSL6WBJZUB3GJKAPQDXZIQV7B2TDBA5OP2WVGHVJMCQFQC

Added -morgue option to specify where morgues are saved.

Added -macro option to specify location of macro file. Morgue files are named morgue-<cname>-<time>.txt, provided Crawl is compiled without SHORT_FILE_NAMES.

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

Created by dshaligram on December 15, 2006

GSQ72ULBSL6WBJZUB3GJKAPQDXZIQV7B2TDBA5OP2WVGHVJMCQFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 738 [4.39949]
B:BD[4.62046] → [3.1929:1962]
```
    coord_def pos(x + 1, y + 1);
```
[4.62046]
[3.1962]
```
    const coord_def pos(x + 1, y + 1);
```

Insertion in crawl-ref/source/ouch.cc at line 807 [5.1104358]

[5.1128789]

static std::string morgue_name()
{
#ifdef SHORT_FILE_NAMES
    return "morgue";
#else  // !SHORT_FILE_NAMES
    std::string name = "morgue-" + std::string(you.your_name);
    time_t when_crawl_got_even = time(NULL);
    if (tm *loc = localtime(&when_crawl_got_even))
    {
        char buf[25];
        snprintf(buf, sizeof buf, "-%04d%02d%02d-%02d%02d",
                 loc->tm_year + 1900,
                 loc->tm_mon + 1,
                 loc->tm_mday,
                 loc->tm_hour,
                 loc->tm_min);
        name += buf;
    }
    return (name);
#endif // SHORT_FILE_NAMES
}

Replacement in crawl-ref/source/ouch.cc at line 900 [5.1104358]
B:BD[5.1130694] → [6.368070:368115]
```
    if (!dump_char( "morgue", !dead, true ))
```
[5.1130694]
[5.1130737]
```
    if (!dump_char( morgue_name(), !dead, true ))
```
Replacement in crawl-ref/source/macro.cc at line 173 [5.2457534]
B:BD[5.2459187] → [5.2459187:2459206]
```
    std::string s;
```
[5.2459187]
[5.2459206]
```
    if (SysEnv.macro_file.length())
        return (SysEnv.macro_file);
```

Replacement in crawl-ref/source/macro.cc at line 176 [5.2457534]

B:BD[5.2459211] → [5.2459211:2459272]

    if (SysEnv.crawl_dir)
        s = SysEnv.crawl_dir;

[5.2459211]

[5.2459272]

    std::string s = SysEnv.crawl_dir? SysEnv.crawl_dir : "";

Replacement in crawl-ref/source/initfile.cc at line 1156 [5.2957258]
B:BD[6.798234] → [6.798234:798263]
```
    check_savedir(save_dir);
```
[6.798234]
[4.403752]
```
    if (!check_dir("Save directory", save_dir))
        exit(1);
```
Replacement in crawl-ref/source/initfile.cc at line 1611 [5.2957258]
∅:D[6.803349] → [4.414326:414335]
B:BD[4.414326] → [4.414326:414335]
```
    }   
```
[6.803349]
[6.803350]
```
    }
```
Replacement in crawl-ref/source/initfile.cc at line 1644 [5.2957258]
B:BD[6.804137] → [6.804137:804179]
```
	note_hp_percent = atoi( field.c_str() );
```
[6.804137]
[6.804179]
```
        note_hp_percent = atoi( field.c_str() );
```
Insertion in crawl-ref/source/initfile.cc at line 2218 [5.2957258]
[2.387]
[2.387]
```
    CLO_MORGUE,
    CLO_MACRO,
```

Replacement in crawl-ref/source/initfile.cc at line 2226 [5.2957258]

B:BD[5.2981901] → [2.405:464]

                                 "vscores", "scorefile" };

[5.2981901]

[5.2981947]

                                 "vscores", "scorefile", "morgue",
                                 "macro" };

Insertion in crawl-ref/source/initfile.cc at line 2324 [5.2957258]

[5.2984335]

            break;
        case CLO_MACRO:
            if (!next_is_param)
                return (false);
            if (!rc_only)
                SysEnv.macro_file = next_arg;
            nextUsed = true;
            break;
        case CLO_MORGUE:
            if (!next_is_param)
                return (false);
            if (!rc_only)
                SysEnv.morgue_dir = next_arg;
            nextUsed = true;

Replacement in crawl-ref/source/files.h at line 34 [5.3082298]
B:BD[6.856639] → [6.856639:856677]
```
void check_savedir(std::string &dir);
```
[6.856639]
[4.431905]
```
bool check_dir(const std::string &what, std::string &dir);
```
Replacement in crawl-ref/source/files.cc at line 407 [5.3084589]
B:BD[6.862025] → [6.862025:862062]
```
void check_savedir(std::string &dir)
```
[6.862025]
[6.862062]
```
bool check_dir(const std::string &whatdir, std::string &dir)
```
Replacement in crawl-ref/source/files.cc at line 410 [5.3084589]
B:BD[6.862085] → [6.862085:862101]
```
        return;
```
[6.862085]
[6.862101]
```
        return (true);
```

Replacement in crawl-ref/source/files.cc at line 424 [5.3084589]

B:BD[6.862412] → [6.862412:862476]

        fprintf(stderr, "Save directory \"%s\" does not exist "

[6.862412]

[6.862476]

        fprintf(stderr, "%s \"%s\" does not exist "

Replacement in crawl-ref/source/files.cc at line 426 [5.3084589]

B:BD[6.862528] → [6.862528:862579]

                    dir.c_str());
        exit(1);

[6.862528]

[6.862579]

                whatdir.c_str(), dir.c_str());
        return (false);

Insertion in crawl-ref/source/files.cc at line 429 [5.3084589]
[6.862585]
[6.862585]
```
    return (true);
```

Insertion in crawl-ref/source/externs.h at line 703 [5.3270163]

[2.2273]

[5.3283192]

    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/chardump.cc at line 959 [5.4100336]

[4.548368]

}
static std::string morgue_directory()
{
    std::string dir =
        !SysEnv.morgue_dir.empty()? SysEnv.morgue_dir :
        SysEnv.crawl_dir          ? SysEnv.crawl_dir : "";
    if (!dir.empty() && !dir[dir.length() - 1] == FILE_SEPARATOR)
        dir += FILE_SEPARATOR;
    return (dir);

Replacement in crawl-ref/source/chardump.cc at line 980 [5.4100336]
B:BD[4.548625] → [6.1218013:1218040]
∅:D[6.1218040] → [5.4123528:4123554]
B:BD[5.4123528] → [5.4123528:4123554]
B:BD[5.4123554] → [6.1218041:1218080]
```
    std::string file_name;
    if (SysEnv.crawl_dir)
        file_name += SysEnv.crawl_dir;
```
[4.548625]
[5.4123610]
```
    std::string file_name = morgue_directory();
```

Insertion in crawl-ref/source/acr.cc at line 192 [5.4397395]

[5.4403851]

        puts("  -morgue <dir>    directory to save character dumps");
        puts("  -macro <file>    macro file name");

Added -morgue option to specify where morgues are saved.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 738 [4.39949]

Insertion in crawl-ref/source/ouch.cc at line 807 [5.1104358]

Replacement in crawl-ref/source/ouch.cc at line 900 [5.1104358]

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

Replacement in crawl-ref/source/macro.cc at line 176 [5.2457534]

Replacement in crawl-ref/source/initfile.cc at line 1156 [5.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1611 [5.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1644 [5.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2218 [5.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2226 [5.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2324 [5.2957258]

Replacement in crawl-ref/source/files.h at line 34 [5.3082298]

Replacement in crawl-ref/source/files.cc at line 407 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 410 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 424 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 426 [5.3084589]

Insertion in crawl-ref/source/files.cc at line 429 [5.3084589]

Insertion in crawl-ref/source/externs.h at line 703 [5.3270163]

Insertion in crawl-ref/source/chardump.cc at line 959 [5.4100336]

Replacement in crawl-ref/source/chardump.cc at line 980 [5.4100336]

Insertion in crawl-ref/source/acr.cc at line 192 [5.4397395]