fiddlerwoaroof/crawl - Change VSP2UVEASZS7NATQOC6C73SGVLLVVLFEPFSQKYGBM4I4D3HFE77QC

Clean up the routine to let vampires eat (drink?) from their inventory,

so that you don't have to press Escape twice to abort out of the prompt.

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

Created by dolorous on March 13, 2008

VSP2UVEASZS7NATQOC6C73SGVLLVVLFEPFSQKYGBM4I4D3HFE77QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/food.cc at line 504 [3.3043806]
[3.3058800]
[3.3058800]
```
    int which_inventory_slot;
```
Replacement in crawl-ref/source/food.cc at line 507 [3.3043806]
B:BD[3.3058801] → [2.7619:7668]
```
    if (slot == -1 && you.species == SP_VAMPIRE)
```
[3.3058801]
[2.7668]
```
    if (you.species != SP_VAMPIRE)
```

Replacement in crawl-ref/source/food.cc at line 509 [3.3043806]

B:BD[2.7674] → [2.7674:7935]

        slot =  prompt_invent_item( "Drain what?",
                                    MT_INVLIST,
                                    OSEL_VAMP_EAT,
                                    true, true, true, 0, NULL,
                                    OPER_EAT );

[2.7674]

[2.7935]

        which_inventory_slot = (slot != -1) ? slot :
                prompt_invent_item( "Eat which item?",
                            MT_INVLIST,
                            OBJ_FOOD,
                            true, true, true, 0, NULL,
                            OPER_EAT );
    }
    else
    {
        which_inventory_slot = (slot != -1) ? slot :
                prompt_invent_item( "Drain what?",
                            MT_INVLIST,
                            OSEL_VAMP_EAT,
                            true, true, true, 0, NULL,
                            OPER_EAT );

Replacement in crawl-ref/source/food.cc at line 525 [3.3043806]
B:BD[2.7941] → [2.7941:7950]
∅:D[2.7950] → [4.5932214:5932265]
B:BD[3.3058801] → [4.5932214:5932265]
∅:D[4.5932265] → [5.853602:853673]
B:BD[6.429395] → [5.853602:853673]
B:BD[5.853673] → [7.13832:13864]
B:BD[7.13864] → [2.7951:7981]
∅:D[2.7981] → [5.853737:853816]
∅:D[8.15744] → [5.853737:853816]
B:BD[5.853737] → [5.853737:853816]
B:BD[5.853816] → [2.7982:8003]
```
        
    int which_inventory_slot = (slot != -1)? slot:
            prompt_invent_item(
                    "Eat which item?",
                    MT_INVLIST,
                    OBJ_FOOD,
                    true, true, true, 0, NULL,
                    OPER_EAT );
                    
```
[2.7941]
[3.3058879]
Replacement in crawl-ref/source/food.cc at line 540 [3.3043806]
B:BD[3.3059247] → [3.3059247:3059248]
B:BD[3.3059248] → [8.15844:15881]
```
    if (you.species == SP_VAMPIRE &&
```
[3.3059247]
[8.15881]
```
    else if (you.species == SP_VAMPIRE &&
```
Replacement in crawl-ref/source/food.cc at line 547 [3.3043806]
B:BD[8.16081] → [8.16081:16089]
```
       
```
[8.16081]
[3.3059248]

Clean up the routine to let vampires eat (drink?) from their inventory,

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/food.cc at line 504 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 507 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 509 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 525 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 540 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 547 [3.3043806]