fiddlerwoaroof/crawl - Change GURIAIJVY6LEADNBTZF3SFBLODYJHWD6OGWFMUGEDI4L5KYO7UFAC

Let e.set_random_mon_list() work, as well as dgn.set_random_mon_list()

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

Created by zelgadis on December 25, 2008

GURIAIJVY6LEADNBTZF3SFBLODYJHWD6OGWFMUGEDI4L5KYO7UFAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapdef.h at line 642 [5.591249]
[4.139353]
[5.593553]
```
    std::vector<mons_spec> random_mons;
```

Replacement in crawl-ref/source/mapdef.cc at line 1204 [5.594797]

B:BD[6.3090] → [6.3090:3229]

B:BD[6.3229] → [2.91435:91491]

      mons(), items(), keyspecs(), prelude("dlprelude"), main("dlmain"),
      validate("dlvalidate"), veto("dlveto"), rock_colour(BLACK),
      floor_colour(BLACK), rock_tile(0), floor_tile(0),

[6.3090]

[2.91491]

      mons(), items(), random_mons(), keyspecs(), prelude("dlprelude"),
      main("dlmain"), validate("dlvalidate"), veto("dlveto"),
      rock_colour(BLACK), floor_colour(BLACK), rock_tile(0), floor_tile(0),

Insertion in crawl-ref/source/mapdef.cc at line 1230 [5.594797]
[7.115]
[8.4984]
```
    random_mons.clear();
```
Insertion in crawl-ref/source/luadgn.cc at line 615 [9.1232]
[3.12920]
[3.12920]
```
    const int nargs = lua_gettop(ls);
```

Replacement in crawl-ref/source/luadgn.cc at line 618 [9.1232]

B:BD[3.12921] → [3.12921:12966]

    mons_list mlist = _lua_get_mlist(ls, 1);

[3.12921]

[3.12966]

    map_def *map = NULL;
    if (nargs > 2)
    {
        luaL_error(ls, "Too many arguments.");
        return (0);
    }
    else if (nargs == 0)
    {
        luaL_error(ls, "Too few arguments.");
        return (0);
    }
    else if (nargs == 2)
    {
        map_def **_map(
                clua_get_userdata<map_def*>(ls, MAP_METATABLE, 1));
        map = *_map;
    }
    if (map)
    {
        if (map->orient != MAP_ENCOMPASS || map->place.is_valid()
            || !map->depths.empty())
        {
            luaL_error(ls, "Can only be used in portal vaults.");
            return (0);
        }
    }

Insertion in crawl-ref/source/luadgn.cc at line 646 [9.1232]

[3.12967]

    int       list_pos = (map != NULL) ? 2 : 1;
    mons_list mlist    = _lua_get_mlist(ls, list_pos);

Insertion in crawl-ref/source/luadgn.cc at line 650 [9.1232]

[3.12994]

    {
        luaL_argerror(ls, list_pos, "Mon list is empty.");

Insertion in crawl-ref/source/luadgn.cc at line 653 [9.1232]
[3.13014]
[3.13014]
```
    }
```

Replacement in crawl-ref/source/luadgn.cc at line 657 [9.1232]

B:BD[3.13047] → [3.13047:13117]

        luaL_argerror(ls, 1, "Mon list must contain only one slot.");

[3.13047]

[3.13117]

        luaL_argerror(ls, list_pos, "Mon list must contain only one slot.");

Replacement in crawl-ref/source/luadgn.cc at line 665 [9.1232]

B:BD[3.13219] → [3.13219:13271]

        luaL_argerror(ls, 1, "Mon list is empty.");

[3.13219]

[3.13271]

        luaL_argerror(ls, list_pos, "Mon list is empty.");

Replacement in crawl-ref/source/luadgn.cc at line 692 [9.1232]

B:BD[3.14029] → [3.14029:14080]

                luaL_argerror(ls, 1, err.c_str());

[3.14029]

[3.14080]

                luaL_argerror(ls, list_pos, err.c_str());

Replacement in crawl-ref/source/luadgn.cc at line 704 [9.1232]

B:BD[3.14471] → [3.14471:14522]

                luaL_argerror(ls, 1, err.c_str());

[3.14471]

[3.14522]

                luaL_argerror(ls, list_pos, err.c_str());

Replacement in crawl-ref/source/luadgn.cc at line 737 [9.1232]

B:BD[3.15502] → [3.15502:15577]

        luaL_argerror(ls, 1, "Mon list contains only pandemonium lords.");

[3.15502]

[3.15577]

        luaL_argerror(ls, list_pos,
                      "Mon list contains only pandemonium lords.");

Replacement in crawl-ref/source/luadgn.cc at line 742 [9.1232]

B:BD[3.15604] → [3.15604:15634]

    set_vault_mon_list(mons);

[3.15604]

[3.15634]

    if (map)
        map->random_mons = mons;
    else
        set_vault_mon_list(mons);

Insertion in crawl-ref/source/dungeon.cc at line 789 [12.3429798]

[10.110527]

[11.7762]


    if (place.map.random_mons.size() > 0)
    {
        ASSERT(you.level_type == LEVEL_PORTAL_VAULT);
        set_vault_mon_list(place.map.random_mons);
    }