fiddlerwoaroof/crawl - Change QGVAXJZXG2HUCLELWAN6LJJOBSP2BS6TIZMPJTDOAGI2E2SUCOCQC

Vampire "eating" interface:

Only offer corpses (inventory or floor) that actually contain blood.

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

Created by j-p-e-g on April 15, 2008

QGVAXJZXG2HUCLELWAN6LJJOBSP2BS6TIZMPJTDOAGI2E2SUCOCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/invent.cc at line 45 [7.2920632]
[5.370236]
[6.3272]
```
#include "mon-util.h"
```
Replacement in crawl-ref/source/invent.cc at line 57 [7.2920632]
B:BD[8.771790] → [8.771790:771826]
```
          invtitle_annotator tfn ) 
```
[8.771790]
[8.771826]
```
          invtitle_annotator tfn )
```

Replacement in crawl-ref/source/invent.cc at line 233 [7.2920632]

B:BD[8.774068] → [8.774068:774124]

        add_hotkey(i.sub_type >= AMU_RAGE? '"' : '=');

[8.774068]

[8.774124]

        add_hotkey(i.sub_type >= AMU_RAGE? '"' : '=');

Replacement in crawl-ref/source/invent.cc at line 314 [7.2920632]
B:BD[2.3147] → [2.3147:3186]
```
            (you.burden * 100) / cap, 
```
[2.3147]
[2.3186]
```
            (you.burden * 100) / cap,
```
Replacement in crawl-ref/source/invent.cc at line 323 [7.2920632]
B:BD[5.372582] → [8.776062:776067]
```
    
```
[5.372582]
[8.776067]
Replacement in crawl-ref/source/invent.cc at line 472 [7.2920632]
B:BD[9.8862] → [9.8862:8867]
```
    
```
[9.8862]
[9.8867]
Replacement in crawl-ref/source/invent.cc at line 515 [7.2920632]
B:BD[9.10060] → [9.10060:10069]
```
        
```
[9.10060]
[9.10069]
Replacement in crawl-ref/source/invent.cc at line 546 [7.2920632]
B:BD[9.10996] → [9.10996:11001]
```
    
```
[9.10996]
[9.11001]
Replacement in crawl-ref/source/invent.cc at line 615 [7.2920632]
B:BD[8.778684] → [8.778684:778722]
```
                    inv->hotkeys[0], 
```
[8.778684]
[8.778722]
```
                    inv->hotkeys[0],
```
Replacement in crawl-ref/source/invent.cc at line 624 [7.2920632]
B:BD[5.374333] → [8.778834:778856]
```
    if (items.size() 
```
[5.374333]
[8.778856]
```
    if (items.size()
```

Replacement in crawl-ref/source/invent.cc at line 629 [7.2920632]

∅:D[8.778962] → [5.374418:374455]

B:BD[5.374418] → [5.374418:374455]

B:BD[5.374455] → [8.778963:779014]

            is_set(MF_MULTISELECT)? 
                MF_SINGLESELECT | MF_ANYPRINTABLE

[8.778962]

[5.374521]

            is_set(MF_MULTISELECT)?
                MF_SINGLESELECT | MF_ANYPRINTABLE

Replacement in crawl-ref/source/invent.cc at line 647 [7.2920632]

B:BD[8.779309] → [8.779309:779378]

    if (!isalnum(mkey) && mkey != '$' && mkey != '-' && mkey != '?'

[8.779219]

[8.779378]

    if (!isalnum(mkey) && mkey != '$' && mkey != '-' && mkey != '?'

Replacement in crawl-ref/source/invent.cc at line 663 [7.2920632]
B:BD[10.11434] → [10.11434:11439]
```
    
```
[10.11434]
[10.11439]

Replacement in crawl-ref/source/invent.cc at line 774 [7.2920632]

B:BD[11.7441] → [11.7441:7481]

                && !food_is_rotten(i));

[11.7441]

[12.2452]

                && !food_is_rotten(i) && mons_has_blood(i.plus));

Replacement in crawl-ref/source/invent.cc at line 813 [7.2920632]
B:BD[7.2927344] → [5.380800:380830]
```
unsigned char invent_select( 
```
[7.2927344]
[8.780114]
```
unsigned char invent_select(
```
Replacement in crawl-ref/source/invent.cc at line 825 [7.2920632]
∅:D[8.780385] → [5.381219:381224]
B:BD[5.381219] → [5.381219:381224]
```
    
```
[8.780385]
[8.780386]

Replacement in crawl-ref/source/invent.cc at line 944 [7.2920632]

B:BD[8.781273] → [8.781273:781321]

                Options.drop_mode == DM_SINGLE

[8.781273]

[8.781321]

                Options.drop_mode == DM_SINGLE

Replacement in crawl-ref/source/invent.cc at line 978 [7.2920632]

B:BD[5.386943] → [5.386943:387001]

            need_redraw = !(keyin == '?' || keyin == '*'

[5.386943]

[5.387001]

            need_redraw = !(keyin == '?' || keyin == '*'

Replacement in crawl-ref/source/invent.cc at line 998 [7.2920632]
B:BD[5.387563] → [5.387563:387599]
```
        else if (isalpha( keyin )) 
```
[5.387563]
[5.387599]
```
        else if (isalpha( keyin ))
```
Replacement in crawl-ref/source/invent.cc at line 1027 [7.2920632]
∅:D[4.3508] → [8.782154:782159]
B:BD[8.782154] → [8.782154:782159]
```
    
```
[4.3508]
[13.4196]
Replacement in crawl-ref/source/invent.cc at line 1077 [7.2920632]
B:BD[14.1340] → [14.1340:1353]
```
            
```
[14.1340]
[14.1353]
Replacement in crawl-ref/source/invent.cc at line 1081 [7.2920632]
B:BD[14.1490] → [14.1490:1503]
```
            
```
[14.1490]
[14.1503]
Replacement in crawl-ref/source/invent.cc at line 1097 [7.2920632]
B:BD[14.1890] → [14.1890:1903]
```
            
```
[14.1890]
[14.1903]
Replacement in crawl-ref/source/invent.cc at line 1104 [7.2920632]
B:BD[15.572] → [15.572:585]
```
            
```
[15.572]
[14.2020]
Replacement in crawl-ref/source/invent.cc at line 1113 [7.2920632]
B:BD[14.2296] → [14.2296:2313]
```
                
```
[14.2296]
[14.2313]

Replacement in crawl-ref/source/invent.cc at line 1154 [7.2920632]

B:BD[16.824] → [16.824:892]

/* return true if user OK'd it (or no warning), false otherwise */

[16.824]

[16.892]

/* return true if user OK'd it (or no warning), false otherwise */

Replacement in crawl-ref/source/invent.cc at line 1187 [7.2920632]
B:BD[17.5707] → [17.5707:5724]
```
                
```
[17.5707]
[17.5724]
Replacement in crawl-ref/source/invent.cc at line 1191 [7.2920632]
B:BD[17.5846] → [17.5846:5855]
```
        
```
[17.5846]
[4.3820]

Replacement in crawl-ref/source/invent.cc at line 1211 [7.2920632]

B:BD[7.2930122] → [8.783264:783368]

int prompt_invent_item( const char *prompt, 
                        menu_type mtype, int type_expect,

[7.2930122]

[7.2930184]

int prompt_invent_item( const char *prompt,
                        menu_type mtype, int type_expect,

Replacement in crawl-ref/source/invent.cc at line 1265 [7.2920632]

B:BD[8.783759] → [8.783759:783822]

                        keyin == '*'? OSEL_ANY : type_expect,

[8.783759]

[18.279]

                        keyin == '*'? OSEL_ANY : type_expect,

Replacement in crawl-ref/source/invent.cc at line 1267 [7.2920632]

∅:D[18.356] → [8.783880:783956]

B:BD[8.783880] → [8.783880:783956]

                            | MF_EASY_EXIT, 
                        NULL,

[18.356]

[8.783956]

                            | MF_EASY_EXIT,
                        NULL,

Replacement in crawl-ref/source/invent.cc at line 1313 [7.2920632]
B:BD[7.2932649] → [7.2932649:2932685]
```
        else if (isalpha( keyin )) 
```
[7.2932649]
[7.2932685]
```
        else if (isalpha( keyin ))
```
Deletion in crawl-ref/source/food.cc at line 580 [7.3043806]
B:BD[5.429975] → [19.16925:16931]
```
    {
```
Deletion in crawl-ref/source/food.cc at line 581 [7.3043806]
B:BD[5.429999] → [19.16932:16938]
```
    }
```
Insertion in crawl-ref/source/food.cc at line 860 [7.3043806]
[20.176]
[7.3062852]
```
    int vamp_undrainable_corpse = 0;
    bool found_valid = false;
```

Replacement in crawl-ref/source/food.cc at line 869 [7.3043806]

B:BD[21.18263] → [21.18263:18381]

∅:D[21.18381] → [7.3062979:3063001]

∅:D[22.26883] → [7.3062979:3063001]

B:BD[7.3062979] → [7.3062979:3063001]

        if (you.species == SP_VAMPIRE &&
            (item.base_type != OBJ_CORPSES || item.sub_type != CORPSE_BODY))
            continue;

[21.18263]

[7.3063397]

        if (you.species == SP_VAMPIRE)
        {
            if (item.base_type != OBJ_CORPSES || item.sub_type != CORPSE_BODY)
                continue;
            if (!mons_has_blood(item.plus))
            {
                vamp_undrainable_corpse++;
                continue;
            }
        }

Insertion in crawl-ref/source/food.cc at line 881 [7.3043806]
[7.3063398]
[23.709]
```
        found_valid = true;
```
Insertion in crawl-ref/source/food.cc at line 886 [7.3043806]
[23.933]
[3.3931]
Replacement in crawl-ref/source/food.cc at line 890 [7.3043806]
B:BD[23.1071] → [23.1071:1100]
```
        else if ( ans == 1 )
```
[23.1071]
[7.3063424]
```
        else if ( ans == 1 )    // yes
```
Insertion in crawl-ref/source/food.cc at line 899 [7.3043806]
[7.3064056]
[7.3064056]
```
        // else no: try next one
```

Insertion in crawl-ref/source/food.cc at line 902 [7.3043806]

[7.3064063]

[20.616]

    if (!found_valid && vamp_undrainable_corpse)
    {
        mprf("%s devoid of blood.",
             (vamp_undrainable_corpse == 1) ? "This corpse is"
                                            : "These corpses are");
        need_more = true;
    }

Vampire "eating" interface:

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/invent.cc at line 45 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 57 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 233 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 314 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 323 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 472 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 515 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 546 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 615 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 624 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 629 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 647 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 663 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 774 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 813 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 825 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 944 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 978 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 998 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1027 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1077 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1081 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1097 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1104 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1113 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1154 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1187 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1191 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1211 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1265 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1267 [7.2920632]

Replacement in crawl-ref/source/invent.cc at line 1313 [7.2920632]

Deletion in crawl-ref/source/food.cc at line 580 [7.3043806]

Deletion in crawl-ref/source/food.cc at line 581 [7.3043806]

Insertion in crawl-ref/source/food.cc at line 860 [7.3043806]

Replacement in crawl-ref/source/food.cc at line 869 [7.3043806]

Insertion in crawl-ref/source/food.cc at line 881 [7.3043806]

Insertion in crawl-ref/source/food.cc at line 886 [7.3043806]

Replacement in crawl-ref/source/food.cc at line 890 [7.3043806]

Insertion in crawl-ref/source/food.cc at line 899 [7.3043806]

Insertion in crawl-ref/source/food.cc at line 902 [7.3043806]