fiddlerwoaroof/crawl - Change YOZHWGKGPWZGHQYNMMBHNGDO2UEVIHPOR6UF3SEZPIYWVMBGWBOAC

Tiles: allow direct selection of corpse to be butchered from floor

   or to drink blood from for vampires

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

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

YOZHWGKGPWZGHQYNMMBHNGDO2UEVIHPOR6UF3SEZPIYWVMBGWBOAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/libgui.h at line 78 [3.5789586]
[3.5791203]
[3.5791203]
```
    INV_USE_FLOOR,
    INV_EAT_FLOOR,
```

Replacement in crawl-ref/source/libgui.cc at line 1229 [3.5793336]

B:BD[3.5825169] → [3.5825169:5825225]

            bool display_actions = mode == REGION_INV1;

[3.5825169]

[3.5825225]

            bool display_actions = (mode == REGION_INV1);

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

[2.6028]

[3.5825596]


                if (mitm[ix].base_type == OBJ_CORPSES
                    && you.inv[ix].sub_type != CORPSE_SKELETON
                    && !food_is_rotten(you.inv[ix]))
                {
                    desc += EOL "[Shift-L-Click] Dissect (D)";
                    
                    if (you.species == SP_VAMPIRE)
                        desc += EOL "[Shift-R-Click] Drink blood (e)";
                }
                else if (mitm[ix].base_type == OBJ_FOOD
                         && you.species != SP_VAMPIRE
                         && you.species != SP_MUMMY)
                {
                    desc += EOL "[Shift-R-Click] Eat (e)";
                }

Replacement in crawl-ref/source/libgui.cc at line 1267 [3.5793336]

B:BD[4.3708] → [4.3708:3933]

                    if (type != OBJ_CORPSES
                        || you.species == SP_VAMPIRE
                           && you.inv[ix].sub_type != CORPSE_SKELETON
                           && you.inv[ix].special >= 100)

[4.3708]

[4.3933]

                    if ((type != OBJ_CORPSES
                         || you.species == SP_VAMPIRE
                            && you.inv[ix].sub_type != CORPSE_SKELETON
                            && you.inv[ix].special >= 100)
                         && (you.species != SP_MUMMY
                             || you.inv[ix].base_type != OBJ_POTIONS
                                && you.inv[ix].base_type != OBJ_FOOD))

Replacement in crawl-ref/source/libgui.cc at line 1564 [3.5793336]

B:BD[3.5831649] → [3.5831649:5831703]

                    gui_set_mouse_inv(-ix, INV_VIEW);

[3.5831649]

[3.5831703]

                {
                    if (shift)
                    {
                        gui_set_mouse_inv(ix, INV_EAT_FLOOR);
                        return CK_MOUSE_B1ITEM;
                    }
                    else
                        gui_set_mouse_inv(-ix, INV_VIEW);
                }

Replacement in crawl-ref/source/libgui.cc at line 1578 [3.5793336]
B:BD[3.5831870] → [3.5831870:5831903]
```
            else if(button == 1)
```
[3.5831870]
[3.5831903]
```
            else if (button == 1)
```

Replacement in crawl-ref/source/libgui.cc at line 1584 [3.5793336]

B:BD[3.5832068] → [3.5832068:5832170]

                    if (button != 1) return 0;
                    gui_set_mouse_inv(ix, INV_PICKUP);

[3.5832068]

[3.5832170]

                    if (!shift)
                        gui_set_mouse_inv(ix, INV_PICKUP);
                    else
                        gui_set_mouse_inv(ix, INV_USE_FLOOR);

Replacement in crawl-ref/source/item_use.h at line 190 [5.2777340]

B:BD[3.5847835] → [3.5847835:5847940]

 *  * called from: acr
 *   * *********************************************************************** */

[3.5847835]

[6.4437]

 * called from: acr
 * *********************************************************************** */

Insertion in crawl-ref/source/item_use.cc at line 4451 [5.2781507]

[3.5849437]

    else if (act == INV_USE_FLOOR)
    {
        if (mitm[idx].base_type == OBJ_CORPSES
            && you.inv[idx].sub_type != CORPSE_SKELETON
            && !food_is_rotten(you.inv[idx]))
        {
            butchery(idx);
        }
        return;
    }
    else if (act == INV_EAT_FLOOR)
    {
        if (mitm[idx].base_type == OBJ_CORPSES
                && you.species == SP_VAMPIRE
            || mitm[idx].base_type == OBJ_FOOD
                && you.species != SP_MUMMY && you.species != SP_VAMPIRE)
        {
            eat_floor_item(idx);
        }
        return;
    }

Replacement in crawl-ref/source/food.h at line 49 [5.3041914]
B:BD[5.3042379] → [5.3042379:3042400]
```
bool butchery(void);
```
[5.3042379]
[5.3042400]
```
bool butchery(int which_corpse = -1);
```
Replacement in crawl-ref/source/food.cc at line 198 [5.3043806]
B:BD[7.850416] → [8.291:307]
```
bool butchery()
```
[7.850416]
[5.3047936]
```
bool butchery(int which_corpse)
```

Replacement in crawl-ref/source/food.cc at line 249 [5.3043806]

B:BD[8.394] → [8.394:418]

    int corpse_id = -1;

[8.394]

[8.418]

    int corpse_id   = -1;
    bool prechosen  = (which_corpse != -1);

Insertion in crawl-ref/source/food.cc at line 258 [5.3043806]

[8.645]

[9.476]

            
            // return pre-chosen corpse if it exists
            if (prechosen && corpse_id == which_corpse)
                break;

Insertion in crawl-ref/source/food.cc at line 264 [5.3043806]

[8.652]

    // pre-chosen corpse not found?
    if (prechosen && corpse_id != which_corpse)
        prechosen = false;

Replacement in crawl-ref/source/food.cc at line 277 [5.3043806]

B:BD[8.921] → [10.464:530]

    else if ( num_corpses > 1 || Options.always_confirm_butcher )

[8.921]

[8.953]

    else if ( !prechosen && (num_corpses > 1 || Options.always_confirm_butcher) )