fiddlerwoaroof/crawl - Change FOQJ5S5WR7P7YMEWQ5Q4O7LTGLQ7LFVM4I2SG2Q7MIVC4PB2JHTQC

Tile changes. waves to Enne

Fix assertion error when unwielding items.

FR 1838216: Make R-click on map really show grid information. FR 1838219: Add more diverse action verbs for items in inventory ("eat", "unwield" etc. rather than plain "use") and allow memorizing by L-clicking on books. Bug 1858432: Show 0 charge icon for empty but unID'd wands.

Also: Don't regard enslavement on friendlies as attack attempt.

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

Created by j-p-e-g on January 12, 2008

FOQJ5S5WR7P7YMEWQ5Q4O7LTGLQ7LFVM4I2SG2Q7MIVC4PB2JHTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 3979 [5.96318]

B:BD[5.223676] → [5.223676:223730]

              (itm->flags & ISFLAG_KNOW_PLUSES )!= 0)

[5.223676]

[5.223730]

              ((itm->flags & ISFLAG_KNOW_PLUSES )!= 0
               || itm->plus2 == ZAPCOUNT_EMPTY))
        {

Insertion in crawl-ref/source/tile1.cc at line 3983 [5.96318]
[5.223757]
[5.223757]
```
        }
```
Replacement in crawl-ref/source/spl-book.h at line 52 [6.395672]
∅:D[3.1730] → [6.397157:397181]
∅:D[7.7927] → [6.397157:397181]
∅:D[8.10992] → [6.397157:397181]
B:BD[6.397157] → [6.397157:397181]
```
bool learn_spell(void);
```
[3.1730]
[6.397182]
```
bool learn_spell(int book = -1);
```
Replacement in crawl-ref/source/spl-book.cc at line 957 [6.397614]
B:BD[6.421001] → [6.421001:421054]
```
static bool which_spellbook( int &book, int &spell )
```
[6.420918]
[6.421054]
```
static int which_spellbook( void )
```
Insertion in crawl-ref/source/spl-book.cc at line 959 [6.397614]
[6.421056]
[6.421056]
```
    int book = -1;
```
Replacement in crawl-ref/source/spl-book.cc at line 966 [6.397614]
B:BD[6.421322] → [6.421322:421346]
```
        return (false);
```
[6.421322]
[6.421346]
```
        return (-1);
```
Replacement in crawl-ref/source/spl-book.cc at line 971 [6.397614]
B:BD[6.421429] → [6.421429:421453]
```
        return (false);
```
[6.421429]
[6.421453]
```
        return (-1);
```
Replacement in crawl-ref/source/spl-book.cc at line 982 [6.397614]
B:BD[6.421761] → [6.421761:421785]
```
        return (false);
```
[6.421761]
[6.421785]
```
        return (-1);
```
Replacement in crawl-ref/source/spl-book.cc at line 989 [6.397614]
B:BD[6.421933] → [6.421933:421957]
```
        return (false);
```
[6.421933]
[6.421957]
```
        return (-1);
```
Replacement in crawl-ref/source/spl-book.cc at line 995 [6.397614]
B:BD[6.422053] → [6.422053:422077]
```
        return (false);
```
[6.422053]
[6.422077]
```
        return (-1);
```
Replacement in crawl-ref/source/spl-book.cc at line 998 [6.397614]
B:BD[6.422084] → [9.137963:138019]
∅:D[9.138019] → [6.422140:422174]
B:BD[6.422140] → [6.422140:422174]
```
    spell = read_book( you.inv[book], RBOOK_MEMORISE );
    clrscr();
    return (true);
```
[6.422084]
[6.422174]
```
    return (book);
```
Replacement in crawl-ref/source/spl-book.cc at line 1179 [6.397614]
∅:D[8.11947] → [6.426263:426286]
B:BD[6.426263] → [6.426263:426286]
```
bool learn_spell(void)
```
[8.11947]
[6.426286]
```
bool learn_spell(int book)
```
Deletion in crawl-ref/source/spl-book.cc at line 1183 [6.397614]
B:BD[6.426360] → [6.426360:426381]
```
    int book, spell;
```
Replacement in crawl-ref/source/spl-book.cc at line 1212 [6.397614]
∅:D[10.244] → [6.426672:426713]
∅:D[11.245] → [6.426672:426713]
B:BD[6.426672] → [6.426672:426713]
```
    if (!which_spellbook( book, spell ))
```
[11.245]
[6.426713]
```
    if (book < 0)
        book = which_spellbook();
        
    if (book < 0) // still -1?
```
Insertion in crawl-ref/source/spl-book.cc at line 1218 [6.397614]
[9.138055]
[9.138055]
```
    int spell = read_book( you.inv[book], RBOOK_MEMORISE );
    clrscr();
```
Deletion in crawl-ref/source/libgui.cc at line 1229 [5.5793336]
B:BD[5.5825760] → [5.5825760:5825806]
```
                    desc += EOL "[L-Click] ";
```

Insertion in crawl-ref/source/libgui.cc at line 1230 [5.5793336]

[5.5825860]

                    if (type != OBJ_CORPSES || you.species == SP_VAMPIRE)
                        desc += EOL "[L-Click] ";

Deletion in crawl-ref/source/libgui.cc at line 1238 [5.5793336]

B:BD[5.5826017] → [5.5826017:5826138]

                    case OBJ_JEWELLERY + 18:
                        desc += "*(R)emove";
                        break;

Insertion in crawl-ref/source/libgui.cc at line 1241 [5.5793336]

[5.5826257]

                        break;
                    case OBJ_WEAPONS + 18:
                    case OBJ_STAVES + 18:
                        desc += "unwield";

Deletion in crawl-ref/source/libgui.cc at line 1253 [5.5793336]
B:BD[5.5826549] → [5.5826549:5826585]
```
                    case OBJ_BOOKS:
```

Insertion in crawl-ref/source/libgui.cc at line 1254 [5.5793336]

[5.5826628]

                        break;
                    case OBJ_BOOKS:
                        desc += "*(M)emorize";

Insertion in crawl-ref/source/libgui.cc at line 1260 [5.5793336]

[5.5826744]

                        break;
                    case OBJ_JEWELLERY + 18:
                        desc += "*(R)emove";

Insertion in crawl-ref/source/libgui.cc at line 1266 [5.5793336]

[5.5826857]

                        break;
                    case OBJ_ARMOUR:
                        desc += "*(W)ear";
                        break;
                    case OBJ_ARMOUR + 18:
                        desc += "*(T)ake off";

Insertion in crawl-ref/source/libgui.cc at line 1273 [5.5793336]

[5.5826888]

                    case OBJ_FOOD:
                        desc += "*(e)at";
                        break;
                    case OBJ_CORPSES:
                        if (you.species == SP_VAMPIRE)
                            desc += "drink blood";
                        else // no action possible
                            desc += EOL;
                        break;

Deletion in crawl-ref/source/libgui.cc at line 1498 [5.5793336]

B:BD[5.5833740] → [5.5833740:5833867]

            const coord_def ep = view2show(coord_def(cx, cy));
            if (env.show(ep) == 0)
                return trig;

Replacement in crawl-ref/source/libgui.cc at line 1499 [5.5793336]

B:BD[5.5833868] → [5.5833868:5834142]

            int mid = mgrd[cx][cy];
            if (mid == NON_MONSTER || !player_monster_visible( &menv[mid] ))
            {
                return trig;
            }
            describe_monsters( menv[ mid ] );
            redraw_screen();
            mesclr( true );

[5.5833868]

[5.5834142]

            const int gx = view2gridX(cx) + 1;
            const int gy = view2gridY(cy) + 1;
            full_describe_square(coord_def(gx,gy));

Replacement in crawl-ref/source/item_use.h at line 191 [6.2777340]
B:BD[5.5847940] → [5.5847940:5847979]
```
void use_item(int idx, InvAction act);
```
[5.5847940]
[5.5847979]
```
void tile_use_item(int idx, InvAction act);
```

Replacement in crawl-ref/source/item_use.cc at line 212 [6.2781507]

B:BD[12.612] → [12.612:692]

    const bool good_swap = 
        you.inv[item_slot].base_type == OBJ_WEAPONS

[12.612]

[12.692]

    const bool good_swap = item_slot == PROMPT_GOT_SPECIAL
        || you.inv[item_slot].base_type == OBJ_WEAPONS

Insertion in crawl-ref/source/item_use.cc at line 233 [6.2781507]
[13.365106]
[6.2785050]
```
    }
```

Replacement in crawl-ref/source/item_use.cc at line 235 [6.2781507]

B:BD[6.2785051] → [6.2785051:2785090]

        if (item_slot == PROMPT_ABORT)

[6.2785051]

[6.2785090]

    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
        return (false);
    }
    else if (item_slot == PROMPT_GOT_SPECIAL)  // '-' or bare hands
    {
        if (you.equip[EQ_WEAPON] != -1)

Replacement in crawl-ref/source/item_use.cc at line 244 [6.2781507]

B:BD[6.2785100] → [6.2785100:2785134]

B:BD[6.2785134] → [13.365107:365135]

∅:D[13.365135] → [6.2785154:2785304]

B:BD[6.2785154] → [6.2785154:2785304]

B:BD[6.2785304] → [2.773:864]

            canned_msg( MSG_OK );
            return (false);
        }
        else if (item_slot == PROMPT_GOT_SPECIAL)  // '-' or bare hands
        {
            if (you.equip[EQ_WEAPON] != -1)
            {
                if (!unwield_item(show_weff_messages))
                    return (false);

[6.2785100]

[2.864]

            if (!unwield_item(show_weff_messages))
                return (false);

Replacement in crawl-ref/source/item_use.cc at line 247 [6.2781507]
∅:D[2.885] → [6.2785438:2785486]
∅:D[14.1143] → [6.2785438:2785486]
B:BD[6.2785438] → [6.2785438:2785486]
```
                canned_msg( MSG_EMPTY_HANDED );
```
[2.885]
[14.1144]
```
            canned_msg( MSG_EMPTY_HANDED );
```

Replacement in crawl-ref/source/item_use.cc at line 249 [6.2781507]

B:BD[14.1145] → [14.1145:1186]

∅:D[14.1186] → [6.2785486:2785676]

B:BD[6.2785486] → [6.2785486:2785676]

B:BD[6.2785676] → [13.365136:365163]

                you.turn_is_over = true;
                you.time_taken *= 3;
                you.time_taken /= 10;
            }
            else
            {
                mpr( "You are already empty-handed." );
            }
            return (true);

[14.1145]

[6.2785696]

            you.turn_is_over = true;
            you.time_taken *= 3;
            you.time_taken /= 10;

Insertion in crawl-ref/source/item_use.cc at line 253 [6.2781507]

[6.2785706]

        else
            mpr( "You are already empty-handed." );
        return (true);

Replacement in crawl-ref/source/item_use.cc at line 4398 [6.2781507]
B:BD[5.5849128] → [5.5849128:5849166]
```
void use_item(int idx, InvAction act)
```
[5.5849128]
[5.5849166]
```
void tile_use_item(int idx, InvAction act)
```
Deletion in crawl-ref/source/item_use.cc at line 4407 [6.2781507]
B:BD[5.5849314] → [5.5849314:5849330]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/item_use.cc at line 4408 [6.2781507]
B:BD[5.5849361] → [5.5849361:5849368]
```
#endif
```
Deletion in crawl-ref/source/item_use.cc at line 4427 [6.2781507]
B:BD[5.5849698] → [5.5849698:5849714]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/item_use.cc at line 4428 [6.2781507]
B:BD[5.5849741] → [5.5849741:5849748]
```
#endif
```

Insertion in crawl-ref/source/item_use.cc at line 4495 [6.2781507]

[5.5851604]

        case OBJ_CORPSES:
            if (you.species != SP_VAMPIRE)
                break;
            // intentional fall-through for Vampires

Insertion in crawl-ref/source/item_use.cc at line 4505 [6.2781507]

[5.5851775]

        case OBJ_BOOKS:
            learn_spell(idx);
            return;

Deletion in crawl-ref/source/item_use.cc at line 4510 [6.2781507]
B:BD[5.5851801] → [5.5851801:5851825]
```
        case OBJ_BOOKS:
```
Replacement in crawl-ref/source/beam.cc at line 3758 [6.4128068]
∅:D[4.18261] → [15.1130:1172]
B:BD[9.1247908] → [15.1130:1172]
```
                if (mons_friendly( mon ))
```
[4.18261]
[16.6506]
```
                if (mons_friendly( mon ) && beam.flavour != BEAM_CHARM)
```
Replacement in crawl-ref/source/acr.cc at line 1660 [6.4397395]
B:BD[5.5938157] → [5.5938157:5938189]
```
            use_item(idx, act);
```
[5.5938157]
[5.5938189]
```
            tile_use_item(idx, act);
```

Tile changes. *waves to Enne*

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile1.cc at line 3979 [5.96318]

Insertion in crawl-ref/source/tile1.cc at line 3983 [5.96318]

Replacement in crawl-ref/source/spl-book.h at line 52 [6.395672]

Replacement in crawl-ref/source/spl-book.cc at line 957 [6.397614]

Insertion in crawl-ref/source/spl-book.cc at line 959 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 966 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 971 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 982 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 989 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 995 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 998 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1179 [6.397614]

Deletion in crawl-ref/source/spl-book.cc at line 1183 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1212 [6.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1218 [6.397614]

Deletion in crawl-ref/source/libgui.cc at line 1229 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1230 [5.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1238 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1241 [5.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1253 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1254 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1260 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1266 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1273 [5.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1498 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1499 [5.5793336]

Replacement in crawl-ref/source/item_use.h at line 191 [6.2777340]

Replacement in crawl-ref/source/item_use.cc at line 212 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 233 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 235 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 244 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 247 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 249 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 253 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4398 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4407 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4408 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4427 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4428 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4495 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4505 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4510 [6.2781507]

Replacement in crawl-ref/source/beam.cc at line 3758 [6.4128068]

Replacement in crawl-ref/source/acr.cc at line 1660 [6.4397395]

Tile changes. waves to Enne