fiddlerwoaroof/crawl - Change F2X5SIIXWXXEL2FVMYDC4GL2ODZ4O7RA46U66VGJ5K2EZHHAQGUAC

Tiles again:

Store index of last cell clicked on in inventory and suppress item description if you just clicked on it, so you can see the messages describing whatever you just did (should fix 2660578).
Allow right-click as a synonym for '!' when toggling ^, A, m.
Let shift left-click on avatar standing on altar = prayer.

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

Created by j-p-e-g on March 6, 2009

F2X5SIIXWXXEL2FVMYDC4GL2ODZ4O7RA46U66VGJ5K2EZHHAQGUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 73 [7.29464]
[6.85595]
[6.85595]
```
bool is_altar(dungeon_feature_type gridc);
```
Deletion in crawl-ref/source/tilesdl.cc at line 616 [8.19415]
B:BD[8.29702] → [8.29702:29746]
```
        && event.button == MouseEvent::LEFT
```

Replacement in crawl-ref/source/tilesdl.cc at line 618 [8.19415]

B:BD[8.29797] → [2.237:268]

        return CK_MOUSE_CLICK;

[8.29797]

[8.29818]

        if (event.button == MouseEvent::LEFT)
            return CK_MOUSE_CLICK;
        else if (event.button == MouseEvent::RIGHT)
            return CK_MOUSE_CMD;

Insertion in crawl-ref/source/tilereg.cc at line 26 [8.54399]
[8.54885]
[8.54885]
```
#include "religion.h"
```
Insertion in crawl-ref/source/tilereg.cc at line 883 [8.54399]
[8.81738]
[8.81738]
```
        {
```

Replacement in crawl-ref/source/tilereg.cc at line 887 [8.54399]

B:BD[8.81809] → [8.81809:81860]

            switch (grid_stair_direction(grd(gc)))

[8.81809]

[8.81860]

            const dungeon_feature_type grid = grd(gc);
            switch (grid_stair_direction(grid))

Replacement in crawl-ref/source/tilereg.cc at line 890 [8.54399]

B:BD[8.81874] → [8.81874:82075]

                case CMD_GO_DOWNSTAIRS:
                    return ('>');
                case CMD_GO_UPSTAIRS:
                    return ('<');
                default:
                    return 0;

[8.81874]

[8.82075]

            case CMD_GO_DOWNSTAIRS:
                return ('>');
            case CMD_GO_UPSTAIRS:
                return ('<');
            default:
                if (is_altar(grid)
                    && player_can_join_god(grid_altar_god(grid)))
                {
                    return ('p');
                }
                return 0;

Replacement in crawl-ref/source/tilereg.cc at line 902 [8.54399]
B:BD[8.82089] → [8.82089:82090]
[8.82089]
[8.82090]
```
        }
```

Replacement in crawl-ref/source/tilereg.cc at line 1022 [8.54399]

B:BD[8.86650] → [9.1969:2103]

        if (grid_stair_direction(grd(m_cursor[CURSOR_MOUSE])) != CMD_NO_CMD)
            tip += "\n[Shift-L-Click] use stairs (</>)";

[8.86650]

[9.2103]

        const dungeon_feature_type grid = grd(m_cursor[CURSOR_MOUSE]);
        const command_type dir = grid_stair_direction(grid);
        if (dir != CMD_NO_CMD)
        {
            tip += "\n[Shift-L-Click] ";
            if (grid == DNGN_ENTER_SHOP)
                tip += "enter shop";
            else if (is_gate(grid))
                tip += "enter gate";
            else
                tip += "use stairs";
            if (dir == CMD_GO_DOWNSTAIRS)
                tip += " (>)";
            else
                tip += " (<)";
        }
        else if (is_altar(grid) && player_can_join_god(grid_altar_god(grid)))
            tip += "\n[Shift-L-Click] pray on altar (p)";

Insertion in crawl-ref/source/tilereg.cc at line 1469 [8.54399]
[8.94278]
[8.94278]
```
    if (m_cursor != cursor)
        you.last_clicked_item = -1;
```
Insertion in crawl-ref/source/tilereg.cc at line 1533 [8.54399]
[8.95902]
[8.95902]
```
        you.last_clicked_item = item_idx;
```
Insertion in crawl-ref/source/tilereg.cc at line 1544 [8.54399]
[8.96158]
[10.322]
```
                you.last_clicked_item = item_idx;
```
Insertion in crawl-ref/source/tilereg.cc at line 1841 [8.54399]
[11.4242]
[11.4242]
```
    if (item_idx == you.last_clicked_item)
        return (false);
```
Insertion in crawl-ref/source/skills2.cc at line 26 [12.647133]
[12.647921]
[13.422]
```
#include "cio.h"
```
Replacement in crawl-ref/source/skills2.cc at line 1547 [12.647133]
B:BD[4.2014] → [4.2014:2019]
```
    
```
[4.2014]
[4.2019]

Replacement in crawl-ref/source/skills2.cc at line 1769 [12.647133]

B:BD[14.1727] → [15.603:684]

∅:D[15.684] → [16.184:256]

B:BD[17.3328] → [16.184:256]

∅:D[16.256] → [17.3400:3532]

B:BD[17.3400] → [17.3400:3532]

            formatted_string::parse_string("Press '<w>!</w>' to toggle between "
                                           "<cyan>progress</cyan> and "
                                           "<red>aptitude</red> "
                                           "display.").display();

[14.1727]

[17.3532]

            formatted_string::parse_string(
#ifndef USE_TILE
                "Press '<w>!</w>'"
#else
                "<w>Right-click</w>"
#endif
                " to toggle between <cyan>progress</cyan> and "
                "<red>aptitude</red> display.").display();

Insertion in crawl-ref/source/skills2.cc at line 1790 [12.647133]
[12.731730]
[18.818]
```
        mouse_control mc(MOUSE_MODE_MORE);
```

Replacement in crawl-ref/source/skills2.cc at line 1792 [12.647133]

B:BD[18.853] → [19.354:409]

        if (keyin == '!' && _player_knows_aptitudes())

[18.853]

[20.805]

        if ((keyin == '!' || keyin == CK_MOUSE_CMD)
            && _player_knows_aptitudes())

Insertion in crawl-ref/source/religion.h at line 85 [12.800304]
[21.28994]
[21.28994]
```
bool player_can_join_god(god_type which_god);
```

Insertion in crawl-ref/source/religion.cc at line 6521 [12.804403]

[12.882083]

[21.30401]

bool player_can_join_god(god_type which_god)
{
    if (you.species == SP_DEMIGOD)
        return (false);
    if (player_is_unholy() && is_good_god(which_god))
        return (false);
    if (which_god == GOD_BEOGH && you.species != SP_HILL_ORC)
        return (false);
    return (true);
}

Replacement in crawl-ref/source/religion.cc at line 6547 [12.804403]
B:BD[22.1820] → [23.2763:2816]
∅:D[23.2816] → [24.3860:3925]
B:BD[24.3860] → [24.3860:3925]
```
    if (player_is_unholy() && is_good_god(which_god)
        || which_god == GOD_BEOGH && you.species != SP_HILL_ORC)
```
[22.1820]
[12.882573]
```
    if (!player_can_join_god(which_god))
```
Insertion in crawl-ref/source/player.cc at line 5897 [12.962854]
[5.6946]
[5.6946]
```
    last_clicked_item = -1;
```
Insertion in crawl-ref/source/mutation.cc at line 29 [12.1263003]
[12.1263889]
[12.1263889]
```
#include "cio.h"
```

Replacement in crawl-ref/source/mutation.cc at line 1551 [12.1263003]

B:BD[25.3534] → [3.43258:43397]

        result += "Press '<w>!</w>' to toggle between mutations and "
            "properties depending on your" EOL "hunger status." EOL;

[25.3534]

[25.3676]

        result +=
#ifndef USE_TILE
            "Press '<w>!</w>'"
#else
            "<w>Right-click</w>"
#endif
            " to toggle between mutations and properties depending on your" EOL
            "hunger status." EOL;

Replacement in crawl-ref/source/mutation.cc at line 1647 [12.1263003]

∅:D[26.5588] → [25.6901:7036]

B:BD[25.6901] → [25.6901:7036]

    result += "Press '<w>!</w>' to toggle between mutations and properties depending on your " EOL
              "hunger status." EOL;

[26.5588]

[25.7036]

    result +=
#ifndef USE_TILE
        "Press '<w>!</w>'"
#else
        "<w>Right-click</w>"
#endif
        " to toggle between mutations and properties depending on your" EOL
        "hunger status." EOL;

Insertion in crawl-ref/source/mutation.cc at line 1661 [12.1263003]
[25.7181]
[25.7181]
```
        mouse_control mc(MOUSE_MODE_MORE);
```
Replacement in crawl-ref/source/mutation.cc at line 1663 [12.1263003]
B:BD[25.7216] → [25.7216:7242]
```
        if (keyin == '!')
```
[25.7216]
[25.7242]
```
        if (keyin == '!' || keyin == CK_MOUSE_CMD)
```
Insertion in crawl-ref/source/mutation.cc at line 1678 [12.1263003]
[25.7358]
[25.7358]
```
        mouse_control mc(MOUSE_MODE_MORE);
```
Replacement in crawl-ref/source/mutation.cc at line 1680 [12.1263003]
B:BD[25.7393] → [25.7393:7419]
```
        if (keyin == '!')
```
[25.7393]
[25.7419]
```
        if (keyin == '!' || keyin == CK_MOUSE_CMD)
```
Replacement in crawl-ref/source/items.cc at line 1258 [12.2584728]
∅:D[27.3126] → [28.3502:3519]
∅:D[29.4210] → [28.3502:3519]
B:BD[30.16992] → [28.3502:3519]
∅:D[28.3519] → [12.2610948:2610982]
∅:D[30.16992] → [12.2610948:2610982]
B:BD[12.2610948] → [12.2610948:2610982]
B:BD[12.2610982] → [28.3520:3526]
B:BD[28.3526] → [8.170197:170233]
∅:D[8.170233] → [28.3526:3569]
B:BD[28.3526] → [28.3526:3569]
```
#ifndef USE_TILE
                keyin = get_ch();
#else
                // TODO enne - why?
                keyin = getch_ck();
#endif
```
[27.3126]
[12.2610982]
```
                mouse_control mc(MOUSE_MODE_MORE);
                keyin = getch();
```
Insertion in crawl-ref/source/externs.h at line 948 [12.3270163]
[5.7308]
[5.7308]
```
  int last_clicked_item; // The inventory cell the player last clicked on.
```

Replacement in crawl-ref/source/describe.cc at line 3360 [12.3736416]

B:BD[15.10930] → [15.10930:11011]

        "Press '<w>!</w>' to toggle between the overview and the more detailed "

[15.10930]

[15.11011]

#ifndef USE_TILE
        "Press '<w>!</w>'"
#else
        "<w>Right-click</w>"
#endif
        " to toggle between the overview and the more detailed "

Replacement in crawl-ref/source/describe.cc at line 3371 [12.3736416]
B:BD[15.11141] → [15.11141:11163]
```
    if (keyin == '!')
```
[15.11141]
[15.11163]
```
    if (keyin == '!' || keyin == CK_MOUSE_CMD)
```

Replacement in crawl-ref/source/describe.cc at line 3602 [12.3736416]

B:BD[15.11486] → [15.11486:11567]

        "Press '<w>!</w>' to toggle between the overview and the more detailed "

[15.11486]

[15.11567]

#ifndef USE_TILE
        "Press '<w>!</w>'"
#else
        "<w>Right-click</w>"
#endif
        " to toggle between the overview and the more detailed "

Deletion in crawl-ref/source/describe.cc at line 3611 [12.3736416]
B:BD[31.5935399] → [31.5935399:5935400]
Replacement in crawl-ref/source/describe.cc at line 3612 [12.3736416]
B:BD[15.11635] → [15.11635:11657]
```
    if (keyin == '!')
```
[15.11635]
[15.11657]
```
    if (keyin == '!' || keyin == CK_MOUSE_CMD)
```

Tiles again:

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.h at line 73 [7.29464]

Deletion in crawl-ref/source/tilesdl.cc at line 616 [8.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 618 [8.19415]

Insertion in crawl-ref/source/tilereg.cc at line 26 [8.54399]

Insertion in crawl-ref/source/tilereg.cc at line 883 [8.54399]

Replacement in crawl-ref/source/tilereg.cc at line 887 [8.54399]

Replacement in crawl-ref/source/tilereg.cc at line 890 [8.54399]

Replacement in crawl-ref/source/tilereg.cc at line 902 [8.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1022 [8.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1469 [8.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1533 [8.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1544 [8.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1841 [8.54399]

Insertion in crawl-ref/source/skills2.cc at line 26 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1547 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1769 [12.647133]

Insertion in crawl-ref/source/skills2.cc at line 1790 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1792 [12.647133]

Insertion in crawl-ref/source/religion.h at line 85 [12.800304]

Insertion in crawl-ref/source/religion.cc at line 6521 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 6547 [12.804403]

Insertion in crawl-ref/source/player.cc at line 5897 [12.962854]

Insertion in crawl-ref/source/mutation.cc at line 29 [12.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1551 [12.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1647 [12.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1661 [12.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1663 [12.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1678 [12.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1680 [12.1263003]

Replacement in crawl-ref/source/items.cc at line 1258 [12.2584728]

Insertion in crawl-ref/source/externs.h at line 948 [12.3270163]

Replacement in crawl-ref/source/describe.cc at line 3360 [12.3736416]

Replacement in crawl-ref/source/describe.cc at line 3371 [12.3736416]

Replacement in crawl-ref/source/describe.cc at line 3602 [12.3736416]

Deletion in crawl-ref/source/describe.cc at line 3611 [12.3736416]

Replacement in crawl-ref/source/describe.cc at line 3612 [12.3736416]