fiddlerwoaroof/crawl - Change JDPJS5SNW6ZTY5DYV5QUBG2WVJ45FJ4CAOK6KDJKPEI2HLIHVLRQC

Croak if necessary Lua files are missing, instead of failing subtly later.

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

Created by dshaligram on June 25, 2007

JDPJS5SNW6ZTY5DYV5QUBG2WVJ45FJ4CAOK6KDJKPEI2HLIHVLRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/luadgn.cc at line 582 [4.1232]
B:BD[4.12900] → [4.12900:12939]
```
    dlua.execfile("clua/dungeon.lua");
```
[4.12900]
[3.3348]
```
    dlua.execfile("clua/dungeon.lua", true, true);
```

Replacement in crawl-ref/source/clua.h at line 68 [5.481234]

B:BD[5.482056] → [6.2382:2444]

    int execfile(const char *filename, bool trusted = false);

[5.482056]

[5.482096]

    int execfile(const char *filename, bool trusted = false,
                 bool die_on_fail = false);

Replacement in crawl-ref/source/clua.h at line 78 [5.481234]

B:BD[5.482440] → [6.2445:2525]

    static int loadfile(lua_State *ls, const char *file, bool trusted = false);

[5.482440]

[6.2525]

    static int loadfile(lua_State *ls, const char *file,
                        bool trusted = false, bool die_on_fail = false);

Replacement in crawl-ref/source/clua.cc at line 232 [5.483969]

B:BD[7.664] → [6.2807:2877]

int CLua::loadfile(lua_State *ls, const char *filename, bool trusted)

[7.664]

[7.720]

int CLua::loadfile(lua_State *ls, const char *filename, bool trusted,
                   bool die_on_fail)

Replacement in crawl-ref/source/clua.cc at line 246 [5.483969]

B:BD[7.937] → [7.937:998]

    const std::string file = datafile_path(filename, false);

[7.937]

[7.998]

    const std::string file = datafile_path(filename, die_on_fail);

Replacement in crawl-ref/source/clua.cc at line 250 [5.483969]

B:BD[5.487259] → [6.2921:2976]

int CLua::execfile(const char *filename, bool trusted)

[5.487259]

[5.487300]

int CLua::execfile(const char *filename, bool trusted, bool die_on_fail)

Replacement in crawl-ref/source/clua.cc at line 258 [5.483969]

B:BD[5.487610] → [8.19720:19782]

    int err = loadfile(ls, filename, trusted || !managed_vm);

[5.487610]

[9.2941]

    int err = loadfile(ls, filename, trusted || !managed_vm, die_on_fail);

Replacement in crawl-ref/source/clua.cc at line 602 [5.483969]

B:BD[2.1715] → [2.1715:1760]

        execfile("clua/userbase.lua", true);

[2.1715]

[7.1259]

        execfile("clua/userbase.lua", true, true);

Replacement in crawl-ref/source/clua.cc at line 617 [5.483969]
B:BD[5.495507] → [6.3025:3063]
```
    execfile("clua/macro.lua", true);
```
[5.495507]
[5.496461]
```
    execfile("clua/macro.lua", true, true);
```