fiddlerwoaroof/crawl - Change 5TG5LXU4DX65KMWCZ7YJHOB3VAETQAVBUHEUSQTPMA327XV2HQWAC

'DD' is now an alias for 'Dy'.

Clean up some corpse handling, add food_is_rotten() function instead of manually checking special < 100 everywhere.

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

Created by haranp on January 16, 2008

5TG5LXU4DX65KMWCZ7YJHOB3VAETQAVBUHEUSQTPMA327XV2HQWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1765 [6.5936]
B:BD[5.11506] → [5.11506:11546]
```
                if (item.special < 100)
```
[5.11506]
[5.11546]
```
                if (food_is_rotten(item))
```

Replacement in crawl-ref/source/tutorial.cc at line 1767 [6.5936]

B:BD[5.11564] → [5.11564:11712]

                    ostr << "Even fewer can safely digest rotten meat, and you're "
                            "probably not part of this group.";

[5.11564]

[5.11712]

                    ostr << "Even fewer can safely digest rotten meat, and "
                            "you're probably not part of that group.";

Replacement in crawl-ref/source/tutorial.cc at line 1893 [6.5936]
B:BD[5.15777] → [5.15777:15813]
```
            if (item.special < 100)
```
[5.15777]
[5.15813]
```
            if (food_is_rotten(item))
```

Replacement in crawl-ref/source/tile1.cc at line 1261 [7.96318]

B:BD[7.132254] → [7.132254:132315]

        if (item.special < 100) ch = TILE_FOOD_CHUNK_ROTTEN;

[7.132254]

[7.132315]

        if (food_is_rotten(item)) ch = TILE_FOOD_CHUNK_ROTTEN;

Replacement in crawl-ref/source/spells4.cc at line 1839 [8.436250]
B:BD[8.493435] → [8.493435:493489]
```
    const bool rotten = (mitm[corpse].special < 100);
```
[8.493435]
[8.493489]
```
    const bool rotten = food_is_rotten(mitm[corpse]);
```
Replacement in crawl-ref/source/spells2.cc at line 493 [8.569242]
B:BD[8.579759] → [8.579759:579801]
```
            if (mitm[objl].special < 100)
```
[8.579759]
[8.579801]
```
            if (food_is_rotten(mitm[objl]))
```

Replacement in crawl-ref/source/religion.cc at line 3678 [8.804403]

∅:D[9.196172] → [8.884596:884650]

B:BD[8.884596] → [8.884596:884650]

}                               // end offer_corpse()

[9.196172]

[10.151]


    // ritual sacrifice can also bloodify the ground
    const int mons_class = mitm[corpse].plus;
    const int max_chunks = mons_weight( mons_class ) / 150;
    bleed_onto_floor(you.x_pos, you.y_pos, mons_class, max_chunks, true);
    destroy_item(corpse);
}

Insertion in crawl-ref/source/itemprop.h at line 700 [9.641567]
[9.646203]
[9.646203]
```
bool food_is_rotten( const item_def &item );
```

Insertion in crawl-ref/source/itemprop.cc at line 1976 [9.646661]

[9.702110]

}
bool food_is_rotten( const item_def &item )
{
    return (item.special < 100) && ((item.base_type == OBJ_CORPSES &&
                                     item.sub_type == CORPSE_BODY) ||
                                    (item.base_type == OBJ_FOOD &&
                                     item.sub_type == FOOD_CHUNK));

Replacement in crawl-ref/source/itemname.cc at line 1330 [8.2667494]

B:BD[2.5403] → [2.5403:5444]

                if (this->special < 100)

[2.5403]

[2.5444]

                if (food_is_rotten(*this))

Replacement in crawl-ref/source/itemname.cc at line 1550 [8.2667494]
B:BD[8.2743655] → [2.6432:6503]
∅:D[2.6503] → [11.10100:10110]
B:BD[12.21095] → [11.10100:10110]
```
        if (item_typ == CORPSE_BODY && this->special < 100 && !dbname)
        {
```
[8.2743655]
[13.34775]
```
        if (food_is_rotten(*this) && !dbname)
```

Replacement in crawl-ref/source/itemname.cc at line 1552 [8.2667494]

B:BD[13.34807] → [11.10111:10121]

∅:D[11.10121] → [13.34807:34817]

B:BD[13.34807] → [13.34807:34817]

B:BD[13.34817] → [2.6504:6597]

∅:D[2.6597] → [13.34955:35181]

∅:D[11.10186] → [13.34955:35181]

B:BD[13.34955] → [13.34955:35181]

        }
        {
            if (!dbname)
                buff << mons_type_name(it_plus, DESC_PLAIN) << ' ';
            if (item_typ == CORPSE_BODY)
                buff << "corpse";
            else if (item_typ == CORPSE_SKELETON)
                buff << "skeleton";
            else
                buff << "corpse bug";
        }

[13.34807]

[8.2744087]


        if (!dbname)
            buff << mons_type_name(it_plus, DESC_PLAIN) << ' ';
        if (item_typ == CORPSE_BODY)
            buff << "corpse";
        else if (item_typ == CORPSE_SKELETON)
            buff << "skeleton";
        else
            buff << "corpse bug";

Replacement in crawl-ref/source/item_use.cc at line 4516 [8.2781507]

B:BD[4.7381] → [4.7381:7428]

                || you.inv[idx].special < 100)

[4.7381]

[4.7428]

                || food_is_rotten(you.inv[idx]))

Insertion in crawl-ref/source/food.cc at line 31 [8.3043806]
[8.3044295]
[14.427382]
```
#include "cio.h"
```
Replacement in crawl-ref/source/food.cc at line 261 [8.3043806]
∅:D[15.688] → [16.1016:1017]
B:BD[17.720] → [16.1016:1017]
[15.688]
[15.689]
```
    
```

Replacement in crawl-ref/source/food.cc at line 279 [8.3043806]

B:BD[15.1247] → [18.556:636]

∅:D[18.636] → [15.1348:1457]

B:BD[15.1348] → [15.1348:1457]

            std::string prompt = "Butcher " + mitm[o].name(DESC_NOCAP_A) + '?';
            const int answer = yesnoquit( prompt.c_str(), true, 'n', false );
            if ( answer == 1 )

[15.1247]

[15.1457]

            mprf("Butcher %s? [y/n/q/D]", mitm[o].name(DESC_NOCAP_A).c_str());
            // possible results:
            // 0 - cancel all butchery (quit)
            // 1 - say no to this butchery, continue prompting
            // 2 - OK this butchery
            // Yes, this is a hack because it's too annoying to adapt
            // yesnoquit() to this purpose.
            int result = 100;
            while (result == 100)

Replacement in crawl-ref/source/food.cc at line 289 [8.3043806]

B:BD[15.1471] → [15.1471:1525]

                corpse_id = o;
                break;

[15.1471]

[15.1525]

                const int keyin = getchm(KC_CONFIRM);
                if (keyin == CK_ESCAPE || keyin == 'q' || keyin == 'Q')
                    result = 0;
                if (keyin == ' ' || keyin == '\r' || keyin == '\n' ||
                    keyin == 'n' || keyin == 'N')
                    result = 1;
                if (keyin == 'y' || keyin == 'Y' || keyin == 'd' ||
                    keyin == 'D')
                    result = 2;

Replacement in crawl-ref/source/food.cc at line 299 [8.3043806]
B:BD[15.1539] → [15.1539:1576]
```
            else if ( answer == -1 )
```
[15.1539]
[15.1576]
```
            if ( result == 0 )
```

Insertion in crawl-ref/source/food.cc at line 304 [8.3043806]

[15.1663]

                break;
            }
            else if ( result == 2 )
            {
                corpse_id = o;

Replacement in crawl-ref/source/food.cc at line 313 [8.3043806]
B:BD[15.1716] → [15.1716:1721]
```
    
```
[15.1716]
[15.1721]
```
   
```

Insertion in crawl-ref/source/food.cc at line 317 [8.3043806]

[15.1812]

[16.1017]

        const bool can_sac = you.duration[DUR_PRAYER]
            && god_likes_butchery(you.religion);

Deletion in crawl-ref/source/food.cc at line 336 [8.3043806]
∅:D[16.1626] → [17.887:937]
B:BD[17.887] → [17.887:937]
```
            const int wpn = you.equip[EQ_WEAPON];
```

Replacement in crawl-ref/source/food.cc at line 339 [8.3043806]

B:BD[17.1010] → [17.1010:1156]

                    (wpn != -1) &&
                    (you.inv[wpn].base_type == OBJ_WEAPONS) &&
                    item_cursed( you.inv[wpn]);

[17.1010]

[17.1156]

                    (you.weapon() != NULL) &&
                    (you.weapon()->base_type == OBJ_WEAPONS) &&
                    item_cursed( *you.weapon() );

Replacement in crawl-ref/source/food.cc at line 344 [8.3043806]

B:BD[19.15559] → [16.1627:1692]

            // note that if wpn == -1 the user selected '-' when

[19.15559]

[17.1302]

            // note that if barehanded then the user selected '-' when

Replacement in crawl-ref/source/food.cc at line 347 [8.3043806]

B:BD[19.15573] → [16.1693:1805]

            if (!barehand_butcher &&
                (!wpn_switch || wpn == -1 || !can_cut_meat(you.inv[wpn])))

[19.15573]

[17.1409]

            if (!barehand_butcher && (!wpn_switch ||
                                      you.weapon() == NULL ||
                                      !can_cut_meat(*you.weapon())))

Replacement in crawl-ref/source/food.cc at line 352 [8.3043806]

B:BD[17.1473] → [17.1473:1508]

                if ( wpn == -1 ) {

[17.1473]

[17.1508]

                if ( you.weapon() == NULL )
                {

Replacement in crawl-ref/source/food.cc at line 371 [8.3043806]
∅:D[17.2084] → [8.3054649:3054650]
∅:D[9.852858] → [8.3054649:3054650]
B:BD[8.3054649] → [8.3054649:3054650]
[17.2084]
[17.2085]
```
        
```

Replacement in crawl-ref/source/food.cc at line 374 [8.3043806]

B:BD[17.2122] → [15.1847:1906]

∅:D[15.1906] → [20.6755:6810]

B:BD[20.6755] → [20.6755:6810]

∅:D[20.6810] → [21.1166:1216]

B:BD[17.2367] → [21.1166:1216]

∅:D[21.1216] → [17.2490:2504]

B:BD[17.2490] → [17.2490:2504]

            bool rotten = (mitm[corpse_id].special < 100);
            if (you.duration[DUR_PRAYER] && !rotten &&
                god_likes_butchery(you.religion))
            {

[17.2122]

[15.1907]

            const bool rotten = food_is_rotten(mitm[corpse_id]);
            if (can_sac && !rotten)

Deletion in crawl-ref/source/food.cc at line 377 [8.3043806]

B:BD[15.1948] → [3.7384:7668]

∅:D[3.7668] → [15.1948:1989]

B:BD[15.1948] → [15.1948:1989]

∅:D[15.1989] → [17.2576:2590]

B:BD[17.2576] → [17.2576:2590]

                // ritual sacrifice can also bloodify the ground
                const int mons_class = mitm[corpse_id].plus;
                const int max_chunks = mons_weight( mons_class ) / 150;
                bleed_onto_floor(you.x_pos, you.y_pos, mons_class, max_chunks, true);
                destroy_item(corpse_id);
            }

Replacement in crawl-ref/source/food.cc at line 379 [8.3043806]

B:BD[17.2621] → [22.338:451]

                if (you.duration[DUR_PRAYER] && rotten
                    && god_likes_butchery(you.religion) )

[17.2621]

[22.451]

                if (can_sac && rotten)

Insertion in crawl-ref/source/food.cc at line 671 [8.3043806]
[8.3061916]
[14.430418]
```
// should really be merged into function below -- FIXME
```

Replacement in crawl-ref/source/food.cc at line 674 [8.3043806]

B:BD[8.3061975] → [23.16316:16445]

    if (you.inv[which_inventory_slot].base_type == OBJ_CORPSES
        && you.inv[which_inventory_slot].sub_type == CORPSE_BODY)

[8.3061975]

[23.16445]

    item_def& food(you.inv[which_inventory_slot]);
    if (food.base_type == OBJ_CORPSES && food.sub_type == CORPSE_BODY)

Replacement in crawl-ref/source/food.cc at line 677 [8.3043806]

B:BD[23.16451] → [23.16451:16519]

        const int mons_type = you.inv[ which_inventory_slot ].plus;

[23.16451]

[23.16519]

        const int mons_type = food.plus;

Replacement in crawl-ref/source/food.cc at line 679 [8.3043806]

B:BD[23.16583] → [23.16583:16727]

        const bool rotten = (you.inv[which_inventory_slot].special < 100);
        const int mass = item_mass( you.inv[which_inventory_slot] );

[23.16583]

[23.16727]

        const bool rotten = food_is_rotten(food);
        const int mass = item_mass( food );

Replacement in crawl-ref/source/food.cc at line 691 [8.3043806]

∅:D[24.660] → [23.16953:17141]

B:BD[23.16953] → [23.16953:17141]

            you.inv[which_inventory_slot].sub_type = CORPSE_SKELETON;
            you.inv[which_inventory_slot].special = 90;
            you.inv[which_inventory_slot].colour = LIGHTGREY;

[24.660]

[23.17141]

            food.sub_type = CORPSE_SKELETON;
            food.special = 90;
            food.colour = LIGHTGREY;

Replacement in crawl-ref/source/food.cc at line 698 [8.3043806]
B:BD[23.17234] → [23.17234:17301]
```
    else if (you.inv[which_inventory_slot].sub_type == FOOD_CHUNK)
```
[23.17234]
[8.3062037]
```
    else if (food.sub_type == FOOD_CHUNK)
```

Replacement in crawl-ref/source/food.cc at line 700 [8.3043806]

B:BD[8.3062043] → [8.3062043:3062215]

        // this is a bit easier to read... most compilers should
        // handle this the same -- bwr
        const int mons_type = you.inv[ which_inventory_slot ].plus;

[8.3062043]

[25.5597]

        const int mons_type = food.plus;

Replacement in crawl-ref/source/food.cc at line 704 [8.3043806]
∅:D[9.853977] → [8.3062279:3062354]
B:BD[8.3062279] → [8.3062279:3062354]
```
        const bool rotten = (you.inv[which_inventory_slot].special < 100);
```
[9.853977]
[26.424]
```
        const bool rotten = food_is_rotten(food);
```

Replacement in crawl-ref/source/food.cc at line 706 [8.3043806]

B:BD[26.425] → [27.697:767]

        if (!prompt_eat_chunk(you.inv[which_inventory_slot], rotten))

[26.425]

[26.747]

        if (!prompt_eat_chunk(food, rotten))

Replacement in crawl-ref/source/food.cc at line 709 [8.3043806]

B:BD[8.3062355] → [28.15779:15863]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal, intel );

[8.3062355]

[8.3062422]

        eat_chunk(determine_chunk_effect(chunk_type, rotten), cannibal, intel);

Replacement in crawl-ref/source/food.cc at line 712 [8.3043806]

B:BD[8.3062437] → [8.3062437:3062564]

    {
        eating( you.inv[which_inventory_slot].base_type,
                you.inv[which_inventory_slot].sub_type );
    }

[8.3062437]

[8.3062564]

        eating( food.base_type, food.sub_type );

Replacement in crawl-ref/source/food.cc at line 719 [8.3043806]

B:BD[14.430506] → [23.17302:17403]

    if (mitm[item_link].base_type == OBJ_CORPSES
        && mitm[item_link].sub_type == CORPSE_BODY)

[14.430506]

[23.17403]

    item_def& food(mitm[item_link]);
    if (food.base_type == OBJ_CORPSES && food.sub_type == CORPSE_BODY)

Replacement in crawl-ref/source/food.cc at line 722 [8.3043806]
B:BD[23.17409] → [23.17409:17461]
```
        const int mons_type = mitm[item_link].plus;
```
[23.17409]
[23.17461]
```
        const int mons_type = food.plus;
```

Replacement in crawl-ref/source/food.cc at line 724 [8.3043806]

B:BD[23.17525] → [23.17525:17641]

        const bool rotten = (mitm[item_link].special < 100);
        const int mass = item_mass( mitm[item_link] );

[23.17525]

[23.17641]

        const bool rotten = food_is_rotten(food);
        const int mass = item_mass( food );

Replacement in crawl-ref/source/food.cc at line 736 [8.3043806]

∅:D[24.736] → [23.17857:18003]

B:BD[23.17857] → [23.17857:18003]

            mitm[item_link].sub_type = CORPSE_SKELETON;
            mitm[item_link].special = 90;
            mitm[item_link].colour = LIGHTGREY;

[24.736]

[23.18003]

            food.sub_type = CORPSE_SKELETON;
            food.special = 90;
            food.colour = LIGHTGREY;

Replacement in crawl-ref/source/food.cc at line 745 [8.3043806]
B:BD[23.18117] → [23.18117:18170]
```
    else if (mitm[item_link].sub_type == FOOD_CHUNK)
```
[23.18117]
[14.430554]
```
    else if (food.sub_type == FOOD_CHUNK)
```

Replacement in crawl-ref/source/food.cc at line 747 [8.3043806]

B:BD[14.430560] → [9.853978:854053]

B:BD[9.854053] → [28.15864:15937]

∅:D[28.15937] → [25.5741:5819]

B:BD[9.854053] → [25.5741:5819]

∅:D[25.5819] → [14.430635:430696]

∅:D[9.854053] → [14.430635:430696]

B:BD[14.430635] → [14.430635:430696]

B:BD[14.430696] → [27.768:824]

        const int chunk_type = mons_corpse_effect( mitm[item_link].plus );
        const int intel = mons_intel( mitm[item_link].plus ) - I_ANIMAL;
        const bool cannibal = is_player_same_species( mitm[item_link].plus );
        const bool rotten = (mitm[item_link].special < 100);
        if (!prompt_eat_chunk(mitm[item_link], rotten))

[14.430560]

[26.1102]

        const int chunk_type = mons_corpse_effect( food.plus );
        const int intel = mons_intel( food.plus ) - I_ANIMAL;
        const bool cannibal = is_player_same_species( food.plus );
        const bool rotten = food_is_rotten(food);
        if (!prompt_eat_chunk(food, rotten))

Replacement in crawl-ref/source/food.cc at line 753 [8.3043806]

B:BD[26.1122] → [28.15938:16022]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal, intel );

[26.1122]

[14.430764]

        eat_chunk(determine_chunk_effect(chunk_type, rotten), cannibal, intel);

Replacement in crawl-ref/source/food.cc at line 756 [8.3043806]

B:BD[14.430779] → [14.430779:430862]

    {
        eating( mitm[item_link].base_type, mitm[item_link].sub_type );
    }

[14.430779]

[14.430862]

        eating( food.base_type, food.sub_type );

Replacement in crawl-ref/source/effects.cc at line 2084 [8.3382105]

B:BD[29.6982] → [29.6982:7069]

        if (you.inv[i].special < 100 && (you.inv[i].special + (time_delta / 20)>=100))

[29.6982]

[29.7069]

        if (you.inv[i].special < 100 &&
            (you.inv[i].special + (time_delta / 20) >=100 ))

Replacement in crawl-ref/source/describe.cc at line 1556 [8.3736416]
B:BD[2.15174] → [2.15174:15210]
```
            if (item.special < 100)
```
[2.15174]
[2.15210]
```
            if (food_is_rotten(item))
```
Replacement in crawl-ref/source/clua.cc at line 1612 [14.483969]
B:BD[14.519667] → [14.519667:519706]
```
        rotting = item->special < 100;
```
[14.519667]
[14.519706]
```
        rotting = food_is_rotten(*item);
```

'DD' is now an alias for 'Dy'.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1765 [6.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1767 [6.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1893 [6.5936]

Replacement in crawl-ref/source/tile1.cc at line 1261 [7.96318]

Replacement in crawl-ref/source/spells4.cc at line 1839 [8.436250]

Replacement in crawl-ref/source/spells2.cc at line 493 [8.569242]

Replacement in crawl-ref/source/religion.cc at line 3678 [8.804403]

Insertion in crawl-ref/source/itemprop.h at line 700 [9.641567]

Insertion in crawl-ref/source/itemprop.cc at line 1976 [9.646661]

Replacement in crawl-ref/source/itemname.cc at line 1330 [8.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1550 [8.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1552 [8.2667494]

Replacement in crawl-ref/source/item_use.cc at line 4516 [8.2781507]

Insertion in crawl-ref/source/food.cc at line 31 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 261 [8.3043806]