fiddlerwoaroof/crawl - Change QXQE7C5XDYNF4JSHGDAVMS7HYLOC6YEZFOVFJ3RD7RB6U4AJSFIQC

Allow Mac users to double-click to launch Crawl:

Use argv[0] to figure out where Crawl lives and where to find data files. The Mac Finder sets the working directory to / and the full path to the executable is available in argv[0] when the user double-clicks.
Converted some of the old char*s to std::string.

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

Created by dshaligram on May 4, 2007

QXQE7C5XDYNF4JSHGDAVMS7HYLOC6YEZFOVFJ3RD7RB6U4AJSFIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 705 [4.1132300]
B:BD[2.7507] → [2.7507:7534]
```
    if (SysEnv.crawl_name)
```
[2.7507]
[2.7534]
```
    if (!SysEnv.crawl_name.empty())
```

Replacement in crawl-ref/source/newgame.cc at line 707 [4.1132300]

B:BD[2.7540] → [2.7540:7603]

        strncpy( you.your_name, SysEnv.crawl_name, kNameLen );

[2.7540]

[2.7603]

        strncpy( you.your_name, SysEnv.crawl_name.c_str(), kNameLen );

Replacement in crawl-ref/source/makefile.unix at line 198 [5.604320]

B:BD[5.607070] → [5.607070:607126]

	mkdir -p $(DATADIR)/data
	cp dat/*.des $(DATADIR)/data

[5.607070]

[6.393]

	mkdir -p $(DATADIR)/dat
	cp dat/*.des $(DATADIR)/dat
	cp dat/*.txt $(DATADIR)/dat
	cp -r lua $(DATADIR)/dat

Replacement in crawl-ref/source/macro.cc at line 174 [4.2457534]

B:BD[7.182] → [7.182:241]

        SysEnv.crawl_dir?           SysEnv.crawl_dir : "";

[7.182]

[4.2459206]

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

Replacement in crawl-ref/source/initfile.cc at line 884 [4.2957258]

B:BD[5.796203] → [5.796203:796278]

        { SysEnv.crawl_rc, "" },
        { SysEnv.crawl_dir, "init.txt" },

[5.796203]

[5.796278]

        { SysEnv.crawl_rc.c_str(), "" },
        { SysEnv.crawl_dir.c_str(), "init.txt" },

Replacement in crawl-ref/source/initfile.cc at line 887 [4.2957258]

B:BD[5.796295] → [5.796295:796370]

        { SysEnv.home, "/.crawlrc" },
        { SysEnv.home, "init.txt" },

[5.796295]

[5.796370]

        { SysEnv.home.c_str(), "/.crawlrc" },
        { SysEnv.home.c_str(), "init.txt" },

Replacement in crawl-ref/source/initfile.cc at line 1529 [4.2957258]

B:BD[8.408649] → [8.408649:408808]

        clua.execfile(field.c_str());
        if (clua.error.length())
            fprintf(stderr, "Lua error: %s\n",
                    clua.error.c_str());

[8.408649]

[8.408808]

        const std::string lua_file = datafile_path(field, false, true);
        if (lua_file.empty())
        {
            fprintf(stderr, "Unable to find lua file: %s\n", field.c_str());
        }
        else
        {
            clua.execfile(lua_file.c_str());
            if (clua.error.length())
                fprintf(stderr, "Lua error: %s\n", clua.error.c_str());
        }

Replacement in crawl-ref/source/initfile.cc at line 1795 [4.2957258]
B:BD[8.415122] → [8.415122:415153]
B:BD[8.415153] → [3.4529:4599]
∅:D[3.4599] → [8.415225:415256]
B:BD[8.415225] → [8.415225:415256]
∅:D[8.415256] → [4.2976768:2976778]
B:BD[4.2976768] → [4.2976768:2976778]
B:BD[4.2976778] → [5.804474:804592]
∅:D[8.415378] → [4.2977045:2977055]
∅:D[5.804592] → [4.2977045:2977055]
B:BD[4.2977045] → [4.2977045:2977055]
```
        if (!SysEnv.crawl_dir)
            SysEnv.crawl_dir = (char*)calloc(kPathLen, sizeof(char));
        if (SysEnv.crawl_dir)
        {
            strncpy(SysEnv.crawl_dir, field.c_str(), kPathLen - 1);
            SysEnv.crawl_dir[ kPathLen - 1 ] = 0;
        }
```
[8.415122]
[8.415379]
```
        SysEnv.crawl_dir = field;
```
Insertion in crawl-ref/source/initfile.cc at line 2360 [4.2957258]
[4.2980786]
[8.426944]
```
}
static std::string check_string(const char *s)
{
    return (s? s : "");
```
Replacement in crawl-ref/source/initfile.cc at line 2370 [4.2957258]
B:BD[4.2980920] → [4.2980920:2980966]
```
    SysEnv.crawl_name = getenv("CRAWL_NAME");
```
[4.2980920]
[4.2980966]
```
    SysEnv.crawl_name = check_string( getenv("CRAWL_NAME") );
```
Replacement in crawl-ref/source/initfile.cc at line 2373 [4.2957258]
B:BD[4.2980993] → [4.2980993:2981041]
```
    SysEnv.crawl_pizza = getenv("CRAWL_PIZZA");
```
[4.2980993]
[4.2981041]
```
    SysEnv.crawl_pizza = check_string( getenv("CRAWL_PIZZA") );
```
Replacement in crawl-ref/source/initfile.cc at line 2377 [4.2957258]
B:BD[4.2981170] → [4.2981170:2981214]
```
    SysEnv.crawl_dir = getenv("CRAWL_DIR");
```
[4.2981170]
[4.2981214]
```
    SysEnv.crawl_dir = check_string( getenv("CRAWL_DIR") );
```
Replacement in crawl-ref/source/initfile.cc at line 2390 [4.2957258]
B:BD[4.2981282] → [4.2981282:2981324]
```
    SysEnv.crawl_rc = getenv("CRAWL_RC");
```
[4.2981282]
[4.2981324]
```
    SysEnv.crawl_rc = check_string( getenv("CRAWL_RC") );
```
Replacement in crawl-ref/source/initfile.cc at line 2397 [4.2957258]
B:BD[4.2981520] → [4.2981520:2981554]
```
    SysEnv.home = getenv("HOME");
```
[4.2981520]
[4.2981554]
```
    SysEnv.home = check_string( getenv("HOME") );
```

Insertion in crawl-ref/source/initfile.cc at line 2400 [4.2957258]

[4.2981625]


static void set_crawl_base_dir(const char *arg)
{
    if (!arg)
        return;

Insertion in crawl-ref/source/initfile.cc at line 2406 [4.2957258]
[4.2981626]
[4.2981626]
```
    SysEnv.crawl_base = get_parent_directory(arg);
}
```
Insertion in crawl-ref/source/initfile.cc at line 2441 [4.2957258]
[4.2982062]
[4.2982062]
```
    set_crawl_base_dir(argv[0]);
    
```

Replacement in crawl-ref/source/food.cc at line 1023 [4.3043806]

B:BD[4.3073577] → [4.3073577:3073634]

B:BD[4.3073634] → [9.19397:19453]

            if (SysEnv.crawl_pizza && !one_chance_in(3))
                mprf("Mmm... %s.", SysEnv.crawl_pizza);

[4.3073539]

[4.3073684]

            if (!SysEnv.crawl_pizza.empty() && !one_chance_in(3))
                mprf("Mmm... %s.", SysEnv.crawl_pizza.c_str());

Replacement in crawl-ref/source/files.h at line 30 [4.3082298]

B:BD[10.26289] → [10.26289:26343]

∅:D[10.26343] → [5.856638:856639]

B:BD[5.856638] → [5.856638:856639]

                          bool croak_on_fail = true);

[10.26289]

[11.1660]

                          bool croak_on_fail = true,
                          bool test_base_path = false);
std::string get_parent_directory(const std::string &filename);

Insertion in crawl-ref/source/files.cc at line 216 [4.3084589]

[5.859610]

std::string get_parent_directory(const std::string &filename)
{
    std::string::size_type pos = filename.rfind(FILE_SEPARATOR);
    if (pos != std::string::npos)
        return filename.substr(0, pos + 1);
#ifdef ALT_FILE_SEPARATOR
    pos = filename.rfind(ALT_FILE_SEPARATOR);
    if (pos != std::string::npos)
        return filename.substr(0, pos + 1);
#endif
    return ("");
}

Replacement in crawl-ref/source/files.cc at line 288 [4.3084589]

B:BD[5.860757] → [10.26345:26420]

std::string datafile_path(const std::string &basename, bool croak_on_fail)

[5.860757]

[5.860812]

std::string datafile_path(const std::string &basename,
                          bool croak_on_fail,
                          bool test_base_path)

Replacement in crawl-ref/source/files.cc at line 292 [4.3084589]

B:BD[5.860814] → [5.860814:860878]

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

[5.860814]

[5.860878]

    if (test_base_path && file_exists(basename))
        return (basename);
    
    std::string cdir = !SysEnv.crawl_dir.empty()? SysEnv.crawl_dir : "";

Deletion in crawl-ref/source/files.cc at line 307 [4.3084589]
B:BD[5.861077] → [5.861077:861123]
```
        std::string("data") + FILE_SEPARATOR,
```

Insertion in crawl-ref/source/files.cc at line 327 [4.3084589]

[5.861539]

    if (!SysEnv.crawl_base.empty())
        bases.push_back(SysEnv.crawl_base);

Replacement in crawl-ref/source/externs.h at line 1173 [4.3270163]

B:BD[4.3282984] → [4.3282984:3283070]

B:BD[4.3283070] → [12.8255:8324]

    char *crawl_name;
    char *crawl_pizza;
    char *crawl_rc;
    char *crawl_dir;
    char *home;                    // only used by MULTIUSER systems

[4.3282984]

[12.8324]

    std::string crawl_name;
    std::string crawl_pizza;
    std::string crawl_rc;
    std::string crawl_dir;
    std::string crawl_base;        // Directory from argv[0], may be used to
                                   // locate datafiles.
    std::string home;              // only used by MULTIUSER systems

Replacement in crawl-ref/source/chardump.cc at line 947 [4.4100336]

B:BD[7.963] → [7.963:1023]

        SysEnv.crawl_dir           ? SysEnv.crawl_dir : "";

[7.963]

[11.2388]

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

Insertion in crawl-ref/source/AppHdr.h at line 183 [4.4573713]
[5.1301630]
[5.1301630]
```
    #define ALT_FILE_SEPARATOR '\\'
```

Allow Mac users to double-click to launch Crawl:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/newgame.cc at line 705 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 707 [4.1132300]

Replacement in crawl-ref/source/makefile.unix at line 198 [5.604320]

Replacement in crawl-ref/source/macro.cc at line 174 [4.2457534]

Replacement in crawl-ref/source/initfile.cc at line 884 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 887 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1529 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1795 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2360 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2370 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2373 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2377 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2390 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2397 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2400 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2406 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2441 [4.2957258]