fiddlerwoaroof/crawl - Change A5PQLNX3XFGSNBUEEI6DYWZZ3U2HZVEPZA6GTIT4ZEC4SHKJUENAC

Add an inventory-like region for the Tiles version to make spells

clickable. '_' toggles between inventory and spell display. Actual tiles are still missing, but everything works as it should.

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

Created by j-p-e-g on September 10, 2009

A5PQLNX3XFGSNBUEEI6DYWZZ3U2HZVEPZA6GTIT4ZEC4SHKJUENAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilesdl.h at line 109 [7.15441]
[6.270]
[7.17655]
```
    void update_spells();
```
Insertion in crawl-ref/source/tilesdl.cc at line 14 [7.19415]
[7.19538]
[8.718]
```
#include "spl-util.h"
```
Replacement in crawl-ref/source/tilesdl.cc at line 1435 [7.19415]
B:BD[7.40297] → [7.40297:40337]
```
void TilesFramework::update_inventory()
```
[7.40297]
[7.40337]
```
void TilesFramework::update_spells()
```

Insertion in crawl-ref/source/tilesdl.cc at line 1438 [7.19415]

[7.40375]


    for (int i = 0; i < 52; ++i)
    {
        const char letter = index_to_letter(i);
        const spell_type spell = get_spell_by_letter(letter);
        if (spell == SPELL_NO_SPELL)
            continue;
        InventoryTile desc;
//         desc.tile = tileidx_spell(item);
        desc.tile = TILE_ERROR;
        desc.idx  = (int) spell;
        // If an equipped artefact prevents teleportation, the following spells
        // cannot be cast.
        if ((spell == SPELL_BLINK || spell == SPELL_CONTROLLED_BLINK
                 || spell == SPELL_TELEPORT_SELF)
             && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
        {
            desc.flag |= TILEI_FLAG_MELDED;
        }
        else if (spell_mana(spell) > you.magic_points)
            desc.flag |= TILEI_FLAG_MELDED;
        inv.push_back(desc);
    }
    const int mx = m_region_inv->mx;
    const int my = m_region_inv->my;

Insertion in crawl-ref/source/tilesdl.cc at line 1467 [7.19415]

[7.40376]

[8.1213]

    const unsigned int max_spells = std::min(22, mx*my);
    while (inv.size() < max_spells)
    {
        InventoryTile desc;
//         if ((int)inv.size() >= max_pack_items)
//             desc.flag |= TILEI_FLAG_INVALID;
        inv.push_back(desc);
    }
    m_region_inv->update(inv.size(), &inv[0]);
}
void TilesFramework::update_inventory()
{

Insertion in crawl-ref/source/tilesdl.cc at line 1483 [7.19415]

[7.40427]

[9.236]

    if (Options.tile_display_spells)
    {
        update_spells();
        return;
    }
    std::vector<InventoryTile> inv;

Replacement in crawl-ref/source/tilesdl.cc at line 1531 [7.19415]
B:BD[7.41285] → [7.41285:41329]
```
        for (int i = 0; i < ENDOFPACK; i++)
```
[7.41285]
[7.41329]
```
        for (int i = 0; i < ENDOFPACK; ++i)
```

Replacement in crawl-ref/source/tilesdl.cc at line 1548 [7.19415]

B:BD[7.41617] → [7.41617:41668]

            for (int eq = 0; eq < NUM_EQUIP; eq++)

[7.41617]

[7.41668]

            for (int eq = 0; eq < NUM_EQUIP; ++eq)

Replacement in crawl-ref/source/tilesdl.cc at line 1574 [7.19415]
B:BD[9.1266] → [9.1266:1309]
```
            for (int i = 0; i < fill; i++)
```
[9.1266]
[9.1309]
```
            for (int i = 0; i < fill; ++i)
```
Insertion in crawl-ref/source/tilereg.cc at line 31 [7.54399]
[7.54906]
[7.54906]
```
#include "spl-cast.h"
#include "spl-util.h"
```

Replacement in crawl-ref/source/tilereg.cc at line 1621 [7.54399]

B:BD[10.3383] → [10.3383:3430]

        if (floor && is_valid_item(mitm[idx]))

[10.3383]

[11.1625]

        if (Options.tile_display_spells)
        {
            desc = spell_title((spell_type) idx);
        }
        else if (floor && is_valid_item(mitm[idx]))

Insertion in crawl-ref/source/tilereg.cc at line 1793 [7.54399]

[7.94505]

static int _handle_spells_mouse(MouseEvent &event, int idx, int item_idx)
{
    const spell_type spell = (spell_type) idx;
    if (event.button == MouseEvent::LEFT)
    {
        you.last_clicked_item = item_idx;
        if (!cast_a_spell(true, spell))
            flush_input_buffer( FLUSH_ON_FAILURE );
        return CK_MOUSE_CMD;
    }
    else if (event.button == MouseEvent::RIGHT)
    {
        you.last_clicked_item = item_idx;
        describe_spell(spell);
        redraw_screen();
        return CK_MOUSE_CMD;
    }
    return 0;
}

Insertion in crawl-ref/source/tilereg.cc at line 1836 [7.54399]

[7.95109]


    if (m_items[item_idx].key == 0 && Options.tile_display_spells)
        return _handle_spells_mouse(event, idx, item_idx);

Replacement in crawl-ref/source/tilereg.cc at line 1845 [7.54399]

B:BD[7.95273] → [7.95273:95352]

    // Do we subclass inventoryregion for the onscreen and offscreen versions?

[7.95273]

[7.95352]

    // Do we subclass InventoryRegion for the onscreen and offscreen versions?

Insertion in crawl-ref/source/tilereg.cc at line 1946 [7.54399]

[7.97855]

void _update_spell_tip_text(std::string& tip, int flag)
{
    if (flag & TILEI_FLAG_MELDED)
        tip = "You cannot cast this spell right now.";
    else
        tip = "[L-Click] Cast (z)";
    tip += "\n[R-Click] Describe (I)";
}

Insertion in crawl-ref/source/tilereg.cc at line 1972 [7.54399]

[7.98358]

    if (display_actions && Options.tile_display_spells)
    {
        _update_spell_tip_text(tip, m_items[item_idx].flag);
        return (true);
    }

Insertion in crawl-ref/source/tilereg.cc at line 2200 [7.54399]

[12.2681]

[13.3995]

}
void _update_spell_alt_text(std::string &alt, int idx)
{
    const spell_type spell = (spell_type) idx;
    describe_info inf;
    get_spell_desc(spell, inf);
    alt_desc_proc proc(crawl_view.msgsz.x, crawl_view.msgsz.y);
    process_description<alt_desc_proc>(proc, inf);
    proc.get_string(alt);

Insertion in crawl-ref/source/tilereg.cc at line 2229 [7.54399]
[14.1430]
[13.4242]

Insertion in crawl-ref/source/tilereg.cc at line 2231 [7.54399]

[13.4279]

    if (m_items[item_idx].key == 0 && Options.tile_display_spells)
    {
        _update_spell_alt_text(alt, idx);
        return (true);
    }

Replacement in crawl-ref/source/spl-cast.h at line 67 [15.291319]
B:BD[15.292220] → [16.413:452]
```
bool cast_a_spell( bool check_range );
```
[15.292220]
[17.160]
```
bool cast_a_spell( bool check_range, spell_type spell = SPELL_NO_SPELL );
```
Replacement in crawl-ref/source/spl-cast.cc at line 664 [15.293070]
B:BD[18.1593] → [16.3204:3240]
```
bool cast_a_spell(bool check_range)
```
[18.1593]
[15.306164]
```
bool cast_a_spell(bool check_range, spell_type spell)
```
Replacement in crawl-ref/source/spl-cast.cc at line 689 [15.293070]
B:BD[15.306606] → [3.269:288]
```
    int keyin = 0;
```
[15.306606]
[19.2003]
```
    if (spell == SPELL_NO_SPELL)
    {
        int keyin = 0;
```
Replacement in crawl-ref/source/spl-cast.cc at line 693 [15.293070]
B:BD[19.2004] → [20.11150:11167]
∅:D[20.11167] → [15.306645:306651]
B:BD[15.306645] → [15.306645:306651]
B:BD[15.306651] → [21.701:725]
```
    while (true)
    {
        if (keyin == 0)
```
[19.2004]
[21.725]
```
        while (true)
```

Replacement in crawl-ref/source/spl-cast.cc at line 695 [15.293070]

B:BD[21.735] → [21.735:805]

            mpr("Cast which spell? (? or * to list) ", MSGCH_PROMPT);

[21.735]

[15.306776]

            if (keyin == 0)
            {
                mpr("Cast which spell? (? or * to list) ", MSGCH_PROMPT);

Replacement in crawl-ref/source/spl-cast.cc at line 699 [15.293070]

B:BD[15.306777] → [21.806:846]

            keyin = get_ch();
        }

[15.306777]

[15.306803]

                keyin = get_ch();
            }

Replacement in crawl-ref/source/spl-cast.cc at line 702 [15.293070]

B:BD[15.306804] → [15.306804:306856]

B:BD[15.306856] → [16.3449:3505]

∅:D[16.3505] → [22.152:208]

B:BD[19.2040] → [22.152:208]

        if (keyin == '?' || keyin == '*')
        {
            keyin = list_spells(true, false, minRange);
            if (!keyin)
                keyin = ESCAPE;

[15.306804]

[15.306893]

            if (keyin == '?' || keyin == '*')
            {
                keyin = list_spells(true, false, minRange);
                if (!keyin)
                    keyin = ESCAPE;

Replacement in crawl-ref/source/spl-cast.cc at line 708 [15.293070]

B:BD[15.306894] → [23.345:429]

            if (!crawl_state.doing_prev_cmd_again)
                redraw_screen();

[15.306894]

[15.306985]

                if (!crawl_state.doing_prev_cmd_again)
                    redraw_screen();
                if (isalpha(keyin) || keyin == ESCAPE)
                    break;
                else
                    mesclr();

Replacement in crawl-ref/source/spl-cast.cc at line 716 [15.293070]

B:BD[15.306986] → [18.1661:1712]

            if (isalpha(keyin) || keyin == ESCAPE)

[15.306986]

[15.307083]

                keyin = 0;
            }
            else

Replacement in crawl-ref/source/spl-cast.cc at line 720 [15.293070]
B:BD[15.307120] → [15.307120:307163]
```
            else
                mesclr();
```
[15.307106]
[21.847]
```
        }
```

Replacement in crawl-ref/source/spl-cast.cc at line 722 [15.293070]

B:BD[21.848] → [21.848:871]

            keyin = 0;

[21.848]

[15.307163]

        if (keyin == ESCAPE)
        {
            canned_msg( MSG_OK );
            return (false);

Deletion in crawl-ref/source/spl-cast.cc at line 727 [15.293070]
B:BD[15.307173] → [15.307173:307186]
B:BD[15.307196] → [15.307196:307215]
B:BD[15.307226] → [15.307226:307232]
```
        else
            break;
    }
```

Replacement in crawl-ref/source/spl-cast.cc at line 728 [15.293070]

B:BD[15.307233] → [15.307233:307258]

B:BD[15.307258] → [24.7925:7961]

∅:D[24.7961] → [15.307258:307282]

B:BD[15.307258] → [15.307258:307282]

B:BD[15.307282] → [24.7962:7968]

    if (keyin == ESCAPE)
    {
        canned_msg( MSG_OK );
        return (false);
    }

[15.307233]

[15.307306]

        if (!isalpha(keyin))
        {
            mpr("You don't know that spell.");
            crawl_state.zero_turns_taken();
            return (false);
        }

Replacement in crawl-ref/source/spl-cast.cc at line 735 [15.293070]
B:BD[15.307307] → [19.2076:2101]
∅:D[19.2101] → [15.307330:307379]
B:BD[15.307330] → [15.307330:307379]
B:BD[15.307379] → [24.7969:8009]
∅:D[24.8009] → [15.307379:307403]
B:BD[15.307379] → [15.307379:307403]
```
    if (!isalpha(keyin))
    {
        mpr("You don't know that spell.");
        crawl_state.zero_turns_taken();
        return (false);
```
[15.307307]
[15.307403]
```
        spell = get_spell_by_letter( keyin );
```
Deletion in crawl-ref/source/spl-cast.cc at line 737 [15.293070]
∅:D[25.11278] → [15.307460:307461]
B:BD[15.307460] → [15.307460:307461]
B:BD[15.307461] → [19.2102:2161]
```
    const spell_type spell = get_spell_by_letter( keyin );
```
Insertion in crawl-ref/source/initfile.cc at line 949 [15.2957258]
[2.5998]
[26.5853847]
```
    tile_display_spells   = false;
```
Replacement in crawl-ref/source/externs.h at line 2115 [15.3270163]
B:BD[27.3087] → [27.3087:3135]
```
    // Some experimental improvments to explore
```
[27.3087]
[27.3135]
```
    // Some experimental improvements to explore
```
Insertion in crawl-ref/source/externs.h at line 2233 [15.3270163]
[28.6206]
[26.5933151]
```
    bool        tile_display_spells;
```

Replacement in crawl-ref/source/enum.h at line 558 [15.3287960]

B:BD[29.7444] → [29.7444:7477]

    CMD_MAX_TILE = CMD_MIN_TILE,

[29.7444]

[29.7477]

    CMD_TOGGLE_SPELL_DISPLAY,
    CMD_MAX_TILE = CMD_TOGGLE_SPELL_DISPLAY,

Insertion in crawl-ref/source/describe.h at line 99 [15.3734214]
[15.3736337]
[5.2859]
```
void get_spell_desc(const spell_type spell, describe_info &inf);
```

Replacement in crawl-ref/source/describe.cc at line 2390 [15.3736416]

∅:D[30.13600] → [15.3844738:3844942]

B:BD[15.3844738] → [15.3844738:3844942]

B:BD[15.3844942] → [4.6586:6648]

//---------------------------------------------------------------
//
// describe_spell
//
// Describes (most) every spell in the game.
//
//---------------------------------------------------------------
void describe_spell(spell_type spelled, const item_def* item)

[30.13600]

[15.3844975]


bool _get_spell_description(const spell_type spell, std::string &description,
                            const item_def* item = NULL)

Deletion in crawl-ref/source/describe.cc at line 2394 [15.3736416]
B:BD[15.3844977] → [15.3844977:3845007]
```
    std::string description;
```
Replacement in crawl-ref/source/describe.cc at line 2396 [15.3736416]
B:BD[15.3845163] → [15.3845163:3845206]
```
    description += spell_title( spelled );
```
[15.3845038]
[31.286]
```
    description  = spell_title( spell );
```

Replacement in crawl-ref/source/describe.cc at line 2398 [15.3736416]

B:BD[31.311] → [31.311:390]

    const std::string long_descrip = getLongDescription(spell_title(spelled));

[31.311]

[32.21083]

    const std::string long_descrip = getLongDescription(spell_title(spell));

Replacement in crawl-ref/source/describe.cc at line 2413 [15.3736416]
B:BD[15.3886379] → [4.6649:6675]
∅:D[4.6675] → [33.11896:11934]
B:BD[15.3886379] → [33.11896:11934]
```
    bool can_mem = false;
    if (you_cannot_memorise(spelled))
```
[15.3886379]
[33.11934]
```
    if (you_cannot_memorise(spell))
```
Deletion in crawl-ref/source/describe.cc at line 2423 [15.3736416]
B:BD[4.6756] → [4.6756:6780]
```
        can_mem = true;
```
Insertion in crawl-ref/source/describe.cc at line 2425 [15.3736416]
[4.6858]
[4.6858]
```
        return (true);
```
Insertion in crawl-ref/source/describe.cc at line 2427 [15.3736416]
[4.6864]
[33.12184]
```
    return (false);
}
```

Replacement in crawl-ref/source/describe.cc at line 2430 [15.3736416]

∅:D[31.580] → [15.3886379:3886415]

∅:D[33.12185] → [15.3886379:3886415]

B:BD[15.3886379] → [15.3886379:3886415]

    print_description(description);

[33.12185]

[15.3886415]

void get_spell_desc(const spell_type spell, describe_info &inf)
{
    std::string desc;
    _get_spell_description(spell, desc);
    inf.body << desc;
}
//---------------------------------------------------------------
//
// describe_spell
//
// Describes (most) every spell in the game.
//
//---------------------------------------------------------------
void describe_spell(spell_type spelled, const item_def* item)
{
    std::string desc;
    bool can_mem = _get_spell_description(spelled, desc, item);
    print_description(desc);

Insertion in crawl-ref/source/command.cc at line 2174 [15.4082507]
[34.11003]
[34.11003]
```
            "<w>_</w> : toggle inventory/spells\n"
```
Insertion in crawl-ref/source/cmd-keys.h at line 3 [35.20639]
[29.7932]
[29.7932]
```
{'_', CMD_TOGGLE_SPELL_DISPLAY},
```
Insertion in crawl-ref/source/cmd-keys.h at line 91 [35.20639]
[35.22098]
[35.22098]
```
#ifndef USE_TILE
```
Insertion in crawl-ref/source/cmd-keys.h at line 93 [35.20639]
[35.22124]
[35.22124]
```
#endif
```

Insertion in crawl-ref/source/acr.cc at line 1355 [15.4397395]

[29.8127]


    case CMD_TOGGLE_SPELL_DISPLAY:
        Options.tile_display_spells = !Options.tile_display_spells;
        tiles.update_inventory();
        break;

Add an inventory-like region for the Tiles version to make spells

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilesdl.h at line 109 [7.15441]

Insertion in crawl-ref/source/tilesdl.cc at line 14 [7.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1435 [7.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1438 [7.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1467 [7.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1483 [7.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1531 [7.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1548 [7.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1574 [7.19415]

Insertion in crawl-ref/source/tilereg.cc at line 31 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1621 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1793 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1836 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1845 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1946 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1972 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2200 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2229 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2231 [7.54399]

Replacement in crawl-ref/source/spl-cast.h at line 67 [15.291319]

Replacement in crawl-ref/source/spl-cast.cc at line 664 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 689 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 693 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 695 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 699 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 702 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 708 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 716 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 720 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 722 [15.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 727 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 728 [15.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 735 [15.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 737 [15.293070]

Insertion in crawl-ref/source/initfile.cc at line 949 [15.2957258]

Replacement in crawl-ref/source/externs.h at line 2115 [15.3270163]

Insertion in crawl-ref/source/externs.h at line 2233 [15.3270163]

Replacement in crawl-ref/source/enum.h at line 558 [15.3287960]

Insertion in crawl-ref/source/describe.h at line 99 [15.3734214]

Replacement in crawl-ref/source/describe.cc at line 2390 [15.3736416]

Deletion in crawl-ref/source/describe.cc at line 2394 [15.3736416]

Replacement in crawl-ref/source/describe.cc at line 2396 [15.3736416]

Replacement in crawl-ref/source/describe.cc at line 2398 [15.3736416]

Replacement in crawl-ref/source/describe.cc at line 2413 [15.3736416]

Deletion in crawl-ref/source/describe.cc at line 2423 [15.3736416]

Insertion in crawl-ref/source/describe.cc at line 2425 [15.3736416]

Insertion in crawl-ref/source/describe.cc at line 2427 [15.3736416]

Replacement in crawl-ref/source/describe.cc at line 2430 [15.3736416]

Insertion in crawl-ref/source/command.cc at line 2174 [15.4082507]

Insertion in crawl-ref/source/cmd-keys.h at line 3 [35.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 91 [35.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 93 [35.20639]

Insertion in crawl-ref/source/acr.cc at line 1355 [15.4397395]