fiddlerwoaroof/crawl - Change GRH4XPIYHDOXXF3R3QPMZTFHGLO2OJAZS4FLNBBXG3DHTQQM7RDQC

Allow "any trap" and "any shop" (alternatives to "random trap" and "random

shop") in des files.

Allow using '8', '9' and '0' in monster specifications.

Tossed out some unused functions.

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

Created by dshaligram on April 10, 2007

GRH4XPIYHDOXXF3R3QPMZTFHGLO2OJAZS4FLNBBXG3DHTQQM7RDQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 225 [5.16817]
∅:D[3.1448] → [4.4972:4974]
B:BD[4.4972] → [4.4972:4974]
∅:D[4.4974] → [5.22069:22070]
B:BD[5.22069] → [5.22069:22070]
B:BD[5.22070] → [4.4975:5122]
B:BD[4.5122] → [3.1449:1488]
∅:D[3.1488] → [4.5122:5138]
B:BD[4.5122] → [4.5122:5138]
```
}
void clear_envmap( void )
{
    for (int i = 0; i < GXM; i++)
    {
        for (int j = 0; j < GYM; j++)
        {
            env.map[i][j] = 0;
            env.map_col[i][j].clear();
        }
    }
```

Deletion in crawl-ref/source/travel.cc at line 327 [6.39949]

B:BD[6.48730] → [6.48730:48926]

void forget_square(int x, int y)
{
    if (you.level_type == LEVEL_LABYRINTH || you.level_type == LEVEL_ABYSS)
        return;
    
    if (is_exclude_root(x, y))
        toggle_exclude(x, y);
}

Replacement in crawl-ref/source/travel.cc at line 1911 [6.39949]
B:BD[6.91635] → [7.1613:1656]
```
static int prompt_travel_depth(int branch)
```
[6.91635]
[6.91688]
```
static int prompt_travel_depth(branch_type branch)
```
Replacement in crawl-ref/source/travel.cc at line 1914 [6.39949]
B:BD[6.91741] → [7.1657:1696]
```
    if ( branches[branch].depth == 1 )
```
[6.91741]
[6.91883]
```
    if (single_level_branch(branch))
```

Replacement in crawl-ref/source/travel.cc at line 2022 [6.39949]

B:BD[6.94437] → [6.94437:94498]

    target.id.depth = prompt_travel_depth(target.id.branch);

[6.94437]

[6.94498]

    target.id.depth =
        prompt_travel_depth(static_cast<branch_type>(target.id.branch));

Deletion in crawl-ref/source/travel.cc at line 3309 [6.39949]
B:BD[4.95811] → [4.95811:95852]
```
void runrest::rundown()
{
    rest();
}
```
Deletion in crawl-ref/source/stash.h at line 242 [6.138156]
B:BD[6.144374] → [6.144374:144433]
```
    bool  in_hell() const;
    bool  in_branch(int) const;
```
Deletion in crawl-ref/source/stash.cc at line 1006 [6.147324]
B:BD[6.171657] → [6.171657:171694]
B:BD[6.171694] → [8.4345:4486]
∅:D[8.4486] → [6.171818:171872]
B:BD[6.171818] → [6.171818:171872]
B:BD[6.171872] → [8.4487:4524]
∅:D[8.4524] → [6.171903:171907]
B:BD[6.171903] → [6.171903:171907]
```
bool LevelStashes::in_hell() const
{
    return place.branch >= BRANCH_DIS
            && place.branch <= BRANCH_THE_PIT
            && place.branch != BRANCH_VESTIBULE_OF_HELL;
}
bool LevelStashes::in_branch(int branchid) const
{
    return place.branch == branchid;
}
```

Deletion in crawl-ref/source/player.h at line 19 [5.945993]

B:BD[4.336043] → [9.54:202]

B:BD[9.202] → [10.1649:1688]

∅:D[10.1688] → [9.202:295]

B:BD[9.202] → [9.202:295]

B:BD[9.295] → [10.1689:1897]

∅:D[10.1897] → [9.295:296]

B:BD[9.295] → [9.295:296]

std::string actor_name(const monsters *actor, description_level_type desc);
std::string actor_verb(const monsters *actor, const std::string &verb);
int actor_size(const monsters *actor);
int actor_damage_type(const monsters *actor);
int actor_damage_brand(const monsters *actor);
bool actor_swimming(const monsters *actor);
bool actor_floundering(const monsters *actor);
item_def *actor_weapon(const monsters *actor, int which_attack = -1);
item_def *actor_shield(const monsters *actor);

Deletion in crawl-ref/source/player.h at line 50 [5.945993]
B:BD[5.947270] → [10.1898:1925]
```
bool player_floundering();
```
Deletion in crawl-ref/source/player.cc at line 362 [5.962854]
B:BD[10.2162] → [10.2162:2244]
∅:D[11.500] → [5.965856:965859]
∅:D[10.2244] → [5.965856:965859]
B:BD[5.965856] → [5.965856:965859]
```
bool player_floundering()
{
    return (player_in_water() && !player_can_swim());
}
```
Deletion in crawl-ref/source/monstuff.h at line 92 [5.1390580]
B:BD[5.1394006] → [5.1394006:1394007]
B:BD[5.1394007] → [10.7289:7364]
```
std::string str_simple_monster_message(monsters *mons, const char *event);
```

Deletion in crawl-ref/source/monstuff.cc at line 1829 [5.1396662]

B:BD[5.1451032] → [10.7366:7632]


std::string str_simple_monster_message(monsters *mons, const char *event)
{
    if (mons_near(mons) && player_monster_visible(mons))
        return make_stringf("%s%s",
                            ptr_monam(mons, DESC_CAP_THE),
                            event );

Deletion in crawl-ref/source/monstuff.cc at line 1830 [5.1396662]
B:BD[5.1451033] → [10.7633:7653]
```
    return ("");
}
```
Insertion in crawl-ref/source/misc.h at line 192 [5.1928926]
[4.542016]
[4.542016]
```
bool single_level_branch(branch_type branch);
```
Replacement in crawl-ref/source/misc.cc at line 1978 [5.1933596]
B:BD[12.15776] → [12.15776:15815]
```
bool single_level_branch( int branch )
```
[12.15776]
[12.15815]
```
bool single_level_branch( branch_type branch )
```
Replacement in crawl-ref/source/misc.cc at line 2178 [5.1933596]
B:BD[13.1803] → [13.1803:1826]
```
    if (s == "random")
```
[13.1803]
[13.1826]
```
    if (s == "random" || s == "any")
```
Deletion in crawl-ref/source/maps.h at line 44 [5.2007036]
B:BD[4.583223] → [4.583223:583268]
```
int find_map_named(const std::string &name);
```
Deletion in crawl-ref/source/maps.cc at line 285 [5.2007666]
B:BD[5.2196057] → [5.2196057:2196058]
B:BD[5.2196058] → [4.588794:588838]
∅:D[4.588838] → [5.2196184:2196186]
B:BD[5.2196184] → [5.2196184:2196186]
B:BD[5.2196186] → [4.588839:588882]
```
int find_map_named(const std::string &name)
{
    if (name.empty())
        return (-1);
```
Deletion in crawl-ref/source/maps.cc at line 286 [5.2007666]
B:BD[5.2196213] → [4.588883:589110]
∅:D[4.589110] → [5.2196671:2196672]
B:BD[5.2196671] → [5.2196671:2196672]
B:BD[5.2196672] → [4.589111:589128]
∅:D[4.589128] → [5.2196694:2196696]
B:BD[5.2196694] → [5.2196694:2196696]
B:BD[5.2196697] → [5.2196697:2196698]
```
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Looking for map named \"%s\"", name.c_str());
#endif
    for (unsigned i = 0, size = vdefs.size(); i < size; ++i)
        if (vdefs[i].name == name)
            return (i);
    return (-1);
}
```
Replacement in crawl-ref/source/mapdef.h at line 158 [4.591249]
B:BD[14.128] → [14.128:147]
```
    int genweight;
```
[14.128]
[14.147]
```
    int  genweight, mlevel;
```

Replacement in crawl-ref/source/mapdef.h at line 162 [4.591249]

B:BD[4.592840] → [14.192:379]

    mons_spec(int id = RANDOM_MONSTER, int gw = 10, bool _fixmons = false,
              bool awaken = false)
        : mid(id), genweight(gw), fix_mons(_fixmons), generate_awake(awaken)

[4.592840]

[14.379]

    mons_spec(int id = RANDOM_MONSTER, int gw = 10, int ml = 0,
              bool _fixmons = false, bool awaken = false)
        : mid(id), genweight(gw), mlevel(ml), fix_mons(_fixmons),
          generate_awake(awaken)

Insertion in crawl-ref/source/mapdef.cc at line 912 [4.594797]
[2.2822]
[15.3742]
```
        int mlevel = 0;
```
Replacement in crawl-ref/source/mapdef.cc at line 920 [4.594797]
B:BD[15.3898] → [15.3898:3939]
```
        const int mid = mons_by_name(s);
```
[15.3898]
[15.3939]
```
        int mid = RANDOM_MONSTER;
```

Replacement in crawl-ref/source/mapdef.cc at line 923 [4.594797]

B:BD[15.3940] → [15.3940:3977]

        if (mid == MONS_PROGRAM_BUG)

[15.3940]

[15.3977]

        if (s == "8")
            mlevel = -8;
        else if (s == "9")
            mlevel = -9;
        else if (s != "0")

Replacement in crawl-ref/source/mapdef.cc at line 929 [4.594797]

B:BD[15.3987] → [15.3987:4090]

            error = make_stringf("unrecognised monster \"%s\"", s.c_str());
            return (slot);

[15.3987]

[15.4090]

            mid = mons_by_name(s);
            if (mid == MONS_PROGRAM_BUG)
            {
                error = make_stringf("unrecognised monster \"%s\"", s.c_str());
                return (slot);
            }

Replacement in crawl-ref/source/mapdef.cc at line 938 [4.594797]

B:BD[15.4101] → [14.949:1030]

        slot.mlist.push_back( mons_spec(mid, weight, fixmons, generate_awake) );

[15.4101]

[15.4166]

        slot.mlist.push_back(
            mons_spec(mid, weight, mlevel, fixmons, generate_awake) );

Replacement in crawl-ref/source/mapdef.cc at line 1365 [4.594797]

B:BD[13.8378] → [13.8378:8445]

    std::vector<dungeon_feature_type> feats = features_by_desc(s);

[13.8378]

[13.8445]

    std::vector<dungeon_feature_type> feats =
        features_by_desc( text_pattern(s, true) );

Deletion in crawl-ref/source/libw32c.h at line 52 [5.2475780]
B:BD[16.187] → [16.187:188]
∅:D[16.188] → [5.2476719:2476775]
B:BD[5.2476719] → [5.2476719:2476775]
```
inline void srandom(unsigned int seed) { srand(seed); }
```
Deletion in crawl-ref/source/externs.h at line 487 [5.3270163]
B:BD[4.896784] → [4.896784:896858]
∅:D[4.896858] → [6.441189:441190]
B:BD[6.441189] → [6.441189:441190]
```
    // Decrements the run counter. Identical to rest.
    void rundown();
```

Insertion in crawl-ref/source/dungeon.cc at line 6049 [5.3429798]

[13.11037]


        const int mlev = monster_type_thing.mlevel;
        if (mlev)
        {
            if (mlev > 0)
                monster_level = mlev;
            else if (mlev == -8)
                monster_level = 4 + monster_level * 2;
            else if (mlev == -9)
                monster_level += 5;
        }

Replacement in crawl-ref/source/describe.cc at line 346 [5.3736416]
B:BD[13.13247] → [13.13247:13270]
```
    if (s == "random")
```
[13.13247]
[13.13270]
```
    if (s == "random" || s == "any")
```

Allow "any trap" and "any shop" (alternatives to "random trap" and "random

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 225 [5.16817]

Deletion in crawl-ref/source/travel.cc at line 327 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 1911 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 1914 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 2022 [6.39949]

Deletion in crawl-ref/source/travel.cc at line 3309 [6.39949]

Deletion in crawl-ref/source/stash.h at line 242 [6.138156]

Deletion in crawl-ref/source/stash.cc at line 1006 [6.147324]

Deletion in crawl-ref/source/player.h at line 19 [5.945993]

Deletion in crawl-ref/source/player.h at line 50 [5.945993]

Deletion in crawl-ref/source/player.cc at line 362 [5.962854]

Deletion in crawl-ref/source/monstuff.h at line 92 [5.1390580]

Deletion in crawl-ref/source/monstuff.cc at line 1829 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1830 [5.1396662]

Insertion in crawl-ref/source/misc.h at line 192 [5.1928926]

Replacement in crawl-ref/source/misc.cc at line 1978 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 2178 [5.1933596]

Deletion in crawl-ref/source/maps.h at line 44 [5.2007036]

Deletion in crawl-ref/source/maps.cc at line 285 [5.2007666]

Deletion in crawl-ref/source/maps.cc at line 286 [5.2007666]

Replacement in crawl-ref/source/mapdef.h at line 158 [4.591249]

Replacement in crawl-ref/source/mapdef.h at line 162 [4.591249]

Insertion in crawl-ref/source/mapdef.cc at line 912 [4.594797]

Replacement in crawl-ref/source/mapdef.cc at line 920 [4.594797]

Replacement in crawl-ref/source/mapdef.cc at line 923 [4.594797]

Replacement in crawl-ref/source/mapdef.cc at line 929 [4.594797]

Replacement in crawl-ref/source/mapdef.cc at line 938 [4.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1365 [4.594797]

Deletion in crawl-ref/source/libw32c.h at line 52 [5.2475780]

Deletion in crawl-ref/source/externs.h at line 487 [5.3270163]

Insertion in crawl-ref/source/dungeon.cc at line 6049 [5.3429798]

Replacement in crawl-ref/source/describe.cc at line 346 [5.3736416]