fiddlerwoaroof/crawl - Change Y556Q6YETK7N56TKR4XS3YTA4RUTUILPN2JC5OPCCTJ6N35VLRPAC

FR 2017276: '<' and '>' both work for portal/shop

Up and down ('<' and '>') now both work for entering shops and portals.

Created by Matthew Cline on October 29, 2009

Y556Q6YETK7N56TKR4XS3YTA4RUTUILPN2JC5OPCCTJ6N35VLRPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/misc.cc at line 1734 [3.1933596]
[3.1943861]
[3.1943861]
```
    // Up and down both work for shops.
```

Insertion in crawl-ref/source/misc.cc at line 1741 [3.1933596]

[3.1943945]

[4.7014]

    // Up and down both work for portals.
    if (get_feature_dchar(stair_find) == DCHAR_ARCH
        && feat_stair_direction(stair_find) != CMD_NO_CMD
        && stair_find != DNGN_ENTER_ZOT)
    {
        down_stairs(you.your_level, force_stair, entry_cause);
        return;
    }

Replacement in crawl-ref/source/misc.cc at line 1750 [3.1933596]

B:BD[4.7080] → [2.21917:21978]

    if (feat_stair_direction(stair_find) != CMD_GO_UPSTAIRS)

[4.7080]

[3.1944183]

    else if (feat_stair_direction(stair_find) != CMD_GO_UPSTAIRS)

Insertion in crawl-ref/source/misc.cc at line 2075 [3.1933596]

[3.1948732]

[4.7228]

    // Up and down both work for shops.
    if (stair_find == DNGN_ENTER_SHOP)
    {
        shop();
        return;
    }
    // Up and down both work for portals.
    if (get_feature_dchar(stair_find) == DCHAR_ARCH
        && feat_stair_direction(stair_find) != CMD_NO_CMD
        && stair_find != DNGN_ENTER_ZOT)
    {
        ;
    }

Replacement in crawl-ref/source/misc.cc at line 2090 [3.1933596]

B:BD[4.7294] → [2.22246:22319]

    if (feat_stair_direction(stair_find) != CMD_GO_DOWNSTAIRS && !shaft)

[4.7294]

[3.1949189]

    else if (feat_stair_direction(stair_find) != CMD_GO_DOWNSTAIRS && !shaft)

Insertion in crawl-ref/source/misc.cc at line 2094 [3.1933596]

[5.954]

        else if (stair_find == DNGN_ABANDONED_SHOP)
            mpr("This shop appears to be closed.");

Insertion in crawl-ref/source/acr.cc at line 1224 [3.4397395]

[6.1260333]

[2.28804]

    // Up and down both work for portals.
    else if (get_feature_dchar(ygrd) == DCHAR_ARCH
             && feat_stair_direction(ygrd) != CMD_NO_CMD
             && ygrd != DNGN_ENTER_ZOT)
    {
        ;
    }

Insertion in crawl-ref/source/acr.cc at line 1257 [3.4397395]
[7.5710]
[7.5710]
```
    const dungeon_feature_type ygrd = grd(you.pos());
```

Replacement in crawl-ref/source/acr.cc at line 1261 [3.4397395]

B:BD[8.9485] → [8.9485:9555]

                        && grd(you.pos()) != DNGN_UNDISCOVERED_TRAP);

[8.9485]

[9.3558]

                        && ygrd != DNGN_UNDISCOVERED_TRAP);

Replacement in crawl-ref/source/acr.cc at line 1272 [3.4397395]

B:BD[10.24944] → [2.28865:28931]

∅:D[2.28931] → [11.1080:1099]

B:BD[11.1080] → [11.1080:1099]

    if (feat_stair_direction(grd(you.pos())) != CMD_GO_DOWNSTAIRS
        && !shaft)

[10.24944]

[12.90459]

    // Up and down both work for shops.
    if (ygrd == DNGN_ENTER_SHOP)
    {
        if (you.duration[DUR_BERSERKER])
            canned_msg(MSG_TOO_BERSERK);
        else
            shop();
        return;
    }
    // Up and down both work for portals.
    else if (get_feature_dchar(ygrd) == DCHAR_ARCH
             && feat_stair_direction(ygrd) != CMD_NO_CMD
             && ygrd != DNGN_ENTER_ZOT)
    {
        ;
    }
    else if (feat_stair_direction(ygrd) != CMD_GO_DOWNSTAIRS
             && !shaft)

Replacement in crawl-ref/source/acr.cc at line 1291 [3.4397395]
B:BD[12.90465] → [13.1316:1363]
```
        if (grd(you.pos()) == DNGN_STONE_ARCH)
```
[12.90465]
[13.1363]
```
        if (ygrd == DNGN_STONE_ARCH)
```

Insertion in crawl-ref/source/acr.cc at line 1293 [3.4397395]

[13.1437]

        else if (ygrd == DNGN_ABANDONED_SHOP)
            mpr("This shop appears to be closed.");