fiddlerwoaroof/crawl - Change SH6NU4H5TG4O7CRXRHZ7MDHABZLWWXQ77NJDBHI7KCVHXHQYK46QC

Changed error message + exit() sequences to end() calls so that the user can

see the error message on the console.

Added docs/ to the data search path for the Windows builds.

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

Created by dshaligram on January 11, 2007

SH6NU4H5TG4O7CRXRHZ7MDHABZLWWXQ77NJDBHI7KCVHXHQYK46QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.h at line 54 [6.217090]
B:BD[6.220039] → [7.2170:2189]
```
void io_cleanup();
```
[6.220039]
[4.19]
```
void cio_init();
void cio_cleanup();
```

Insertion in crawl-ref/source/stuff.cc at line 465 [6.224557]

[6.231074]


static bool io_inited = false;
void cio_init()
{
#ifdef UNIX
    unixcurses_startup();
#endif

Replacement in crawl-ref/source/stuff.cc at line 473 [6.224557]

B:BD[6.231075] → [7.2191:2209]

void io_cleanup()

[6.231075]

[6.231097]

#ifdef WIN32CONSOLE
    init_libw32c();
#endif
#ifdef DOS
    init_libdos();
#endif
    io_inited = true;
}
void cio_cleanup()

Insertion in crawl-ref/source/stuff.cc at line 486 [6.224557]
[6.231099]
[8.292]
```
    if (!io_inited)
        return;
    
```
Insertion in crawl-ref/source/stuff.cc at line 496 [6.224557]
[6.231232]
[7.2210]
```
    io_inited = false;
```
Replacement in crawl-ref/source/stuff.cc at line 504 [6.224557]
∅:D[4.244] → [7.2237:2255]
B:BD[7.2237] → [7.2237:2255]
```
    io_cleanup();
```
[4.244]
[4.245]
```
    cio_cleanup();
```
Replacement in crawl-ref/source/stuff.cc at line 510 [6.224557]
B:BD[4.320] → [4.320:346]
```
        char buffer[500];
```
[4.320]
[4.346]
```
        char buffer[100];
```

Replacement in crawl-ref/source/monstuff.cc at line 4967 [6.1396662]

B:BD[6.1548468] → [6.1548468:1548554]

        cprintf("Fatal error: monster steps on nonexistent cloud!");
        exit(0);

[6.1548468]

[6.1548554]

        end(1, false, "Fatal error: monster steps on nonexistent cloud!");

Replacement in crawl-ref/source/maps.cc at line 318 [6.2007666]
∅:D[9.590669] → [6.2216646:2216652]
B:BD[6.2216646] → [6.2216646:2216652]
B:BD[6.2216652] → [9.590670:590785]
∅:D[9.590785] → [6.2217156:2217162]
B:BD[6.2217156] → [6.2217156:2217162]
```
    {
        fprintf(stderr, "Failed to open %s for reading: %d\n", s.c_str(),
                errno);
        exit(1);
    }
```
[9.590669]
[6.2217187]
```
        end(1, true, "Failed to open %s for reading: %d\n", s.c_str());
```

Replacement in crawl-ref/source/libutil.cc at line 419 [6.2494093]

B:BD[9.624124] → [9.624124:624197]

    {
        fprintf(stderr, "Out of memory\n");
        exit(1);
    }

[9.624124]

[6.2496217]

        end(1, false, "Out of memory\n");

Replacement in crawl-ref/source/initfile.cc at line 1179 [6.2957258]
B:BD[3.1016] → [3.1016:1033]
```
        exit(1);
```
[3.1016]
[10.403752]
```
        end(1);
```
Replacement in crawl-ref/source/files.cc at line 369 [6.3084589]
B:BD[9.861123] → [9.861123:861175]
```
        std::string("crawl-data") + FILE_SEPARATOR,
```
[9.861123]
[5.1610]
```
        std::string("docs") + FILE_SEPARATOR,
```

Replacement in crawl-ref/source/files.cc at line 403 [6.3084589]

B:BD[9.861888] → [9.861888:862004]

    fprintf(stderr, "Cannot find data file '%s' anywhere, aborting\n", 
            basename.c_str());
    exit(1);

[9.861888]

[9.862004]

    end(1, false, "Cannot find data file '%s' anywhere, aborting\n", 
        basename.c_str());

Replacement in crawl-ref/source/dungeon.cc at line 3720 [6.3429798]

B:BD[9.960888] → [9.960888:961081]

            {
                fprintf(stderr, "Failed to find Pandemonium level %s!\n",
                        pandemon_level_names[(int) which_demon]);
                exit(1);
            }

[9.960888]

[9.961081]

                end(1, false, "Failed to find Pandemonium level %s!\n",
                    pandemon_level_names[(int) which_demon]);

Replacement in crawl-ref/source/dungeon.cc at line 3731 [6.3429798]

B:BD[9.961246] → [9.961246:961376]

            {
                fprintf(stderr, "Failed to build Pandemonium minivault!\n");
                exit(1);
            }

[9.961246]

[9.961376]

                end(1, false, "Failed to build Pandemonium minivault!\n");

Deletion in crawl-ref/source/acr.cc at line 163 [6.4397395]
B:BD[9.1255838] → [9.1255838:1255861]
```
static void init_io();
```
Deletion in crawl-ref/source/acr.cc at line 325 [6.4397395]
∅:D[9.1256305] → [6.4407782:4407783]
B:BD[6.4407782] → [6.4407782:4407783]
B:BD[6.4407783] → [9.1256306:1256368]
∅:D[9.1256368] → [6.4407812:4407820]
B:BD[6.4407812] → [6.4407812:4407820]
B:BD[6.4407820] → [9.1256369:1256409]
∅:D[9.1256409] → [6.4407853:4407860]
B:BD[6.4407853] → [6.4407853:4407860]
```
static void init_io()
{
#ifdef UNIX
    unixcurses_startup();
#endif
#ifdef WIN32CONSOLE
    init_libw32c();
#endif
```
Deletion in crawl-ref/source/acr.cc at line 326 [6.4397395]
B:BD[6.4407861] → [9.1256410:1256449]
∅:D[9.1256449] → [6.4407921:4407922]
B:BD[6.4407921] → [6.4407921:4407922]
```
#ifdef DOS
    init_libdos();
#endif
}
```
Replacement in crawl-ref/source/acr.cc at line 2669 [6.4397395]
B:BD[2.193] → [2.193:208]
```
    init_io();
```
[2.193]
[2.208]
```
    cio_init();
```

Changed error message + exit() sequences to end() calls so that the user can

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/stuff.h at line 54 [6.217090]

Insertion in crawl-ref/source/stuff.cc at line 465 [6.224557]

Replacement in crawl-ref/source/stuff.cc at line 473 [6.224557]

Insertion in crawl-ref/source/stuff.cc at line 486 [6.224557]

Insertion in crawl-ref/source/stuff.cc at line 496 [6.224557]

Replacement in crawl-ref/source/stuff.cc at line 504 [6.224557]

Replacement in crawl-ref/source/stuff.cc at line 510 [6.224557]

Replacement in crawl-ref/source/monstuff.cc at line 4967 [6.1396662]

Replacement in crawl-ref/source/maps.cc at line 318 [6.2007666]

Replacement in crawl-ref/source/libutil.cc at line 419 [6.2494093]

Replacement in crawl-ref/source/initfile.cc at line 1179 [6.2957258]

Replacement in crawl-ref/source/files.cc at line 369 [6.3084589]

Replacement in crawl-ref/source/files.cc at line 403 [6.3084589]

Replacement in crawl-ref/source/dungeon.cc at line 3720 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3731 [6.3429798]

Deletion in crawl-ref/source/acr.cc at line 163 [6.4397395]

Deletion in crawl-ref/source/acr.cc at line 325 [6.4397395]

Deletion in crawl-ref/source/acr.cc at line 326 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 2669 [6.4397395]