fiddlerwoaroof/crawl - Change XVX7AVLLYZJIJUZA2LZ6T57PHULWPDRZOHELDF4JHZ35EMINFFZQC

A few small message changes and additions, mostly

concerning portals. Oh, and portals will now stop travel just like other interesting features.

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

Created by j-p-e-g on August 22, 2007

XVX7AVLLYZJIJUZA2LZ6T57PHULWPDRZOHELDF4JHZ35EMINFFZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 133 [4.29464]

B:BD[3.460] → [3.460:493]

    ES_ALTAR              = 0x20

[3.460]

[4.33848]

    ES_ALTAR              = 0x20,
    ES_PORTAL             = 0x40

Insertion in crawl-ref/source/travel.cc at line 719 [4.39949]
[5.1740]
[3.1551]
```
#define ES_portal (Options.explore_stop & ES_PORTAL)
```

Insertion in crawl-ref/source/travel.cc at line 3713 [4.39949]

[5.3718]

[6.23794]

    else if (grid_is_portal(grid) && ES_portal)
    {
        const named_thing<int> portal(cleaned_feature_description(grid), 1);
        add_stair(portal);
        es_flags |= ES_PORTAL;
    }

Insertion in crawl-ref/source/spells3.cc at line 856 [7.531613]
[7.555543]
[7.555543]
```
    const char *old_desc = you.inv[ammo].name(DESC_CAP_YOUR).c_str();
```

Replacement in crawl-ref/source/spells3.cc at line 859 [7.531613]

B:BD[7.555623] → [8.1404:1578]

        mprf("%s %s covered in a thin film of poison.",
             you.inv[ammo].name(DESC_CAP_YOUR).c_str(),
             (you.inv[ammo].quantity == 1) ? " is" : " are");

[7.555623]

[7.555853]

        mprf("%s %s covered in a thin film of poison.", old_desc,
             (you.inv[ammo].quantity == 1) ? "is" : "are");

Insertion in crawl-ref/source/misc.h at line 153 [7.1928926]
[9.2931]
[10.138875]
```
bool grid_is_portal(dungeon_feature_type grid);
```

Insertion in crawl-ref/source/misc.cc at line 206 [7.1933596]

[9.3724]

bool grid_is_portal(dungeon_feature_type grid)
{
    return (grid == DNGN_ENTER_PORTAL_VAULT || grid == DNGN_EXIT_PORTAL_VAULT);
}

Replacement in crawl-ref/source/misc.cc at line 966 [7.1933596]

B:BD[11.445] → [11.445:480]

    if (grid_is_rock_stair(stair))

[11.445]

[11.480]

    if (grid_is_portal(stair))
        mpr("You pass through the gateway.");
    else if (grid_is_rock_stair(stair))

Replacement in crawl-ref/source/misc.cc at line 973 [7.1933596]

B:BD[11.579] → [11.579:620]

            mpr("You slide downwards.");

[11.579]

[11.620]

        {
            mprf("You %s downwards.", you.flies()? "fly" :
                                     (player_is_levitating()? "float" :
                                      "slide"));
        }

Replacement in crawl-ref/source/misc.cc at line 980 [7.1933596]

B:BD[11.635] → [11.635:705]

        mpr(going_up? "You climb upwards." : "You climb downwards.");

[11.635]

[12.5105]

    {
        mprf("You %s %swards.", you.flies()? "fly" :
                                (player_is_levitating()? "float" : "climb"),
                                going_up? "up": "down");
    }

Replacement in crawl-ref/source/initfile.cc at line 659 [7.2957258]

B:BD[3.8763] → [13.143:212]

    explore_stop           = ES_ITEM | ES_STAIR | ES_SHOP | ES_ALTAR

[3.8763]

[13.212]

    explore_stop           = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP | ES_ALTAR

Insertion in crawl-ref/source/direct.cc at line 1413 [7.3697945]

[9.39509]

[2.8406]

    case DNGN_ENTER_PORTAL_VAULT:
        return ("gate leading to another dimension");