fiddlerwoaroof/crawl - Change FWWAYEWZS32VGKS6KE5ZIVSGTSBGYNNUHVE4GFRAKAHS2WUF3K6QC

More type safety.

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

Created by haranp on January 31, 2009

FWWAYEWZS32VGKS6KE5ZIVSGTSBGYNNUHVE4GFRAKAHS2WUF3K6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/it_use3.cc at line 456 [5.2870456]
B:BD[5.2880717] → [5.2880717:2880743]
```
    else if (wield == -1)
```
[5.2880717]
[5.2880743]
```
    else if (!you.weapon())
```
Replacement in crawl-ref/source/it_use3.cc at line 463 [5.2870456]
B:BD[5.2880826] → [6.25434:25470]
```
    item_def& wpn = you.inv[wield];
```
[5.2880826]
[7.258]
```
    item_def& wpn = *you.weapon();
```
Replacement in crawl-ref/source/it_use3.cc at line 483 [5.2870456]
B:BD[5.2881263] → [6.25554:25597]
```
        else if (is_fixed_artefact( wpn ))
```
[5.2881263]
[5.2881317]
```
        else if (is_fixed_artefact(wpn))
```
Deletion in crawl-ref/source/food.cc at line 17 [5.3043806]
B:BD[5.3044147] → [5.3044147:3044196]
```
// required for abs() {dlb}:
#include <stdlib.h>
```

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

B:BD[5.3044644] → [8.3072:3150]

B:BD[8.3150] → [3.4977:5053]

static int  _determine_chunk_effect(int which_chunk_type, bool rotten_chunk);
static void _eat_chunk(int chunk_effect, bool cannibal, int mon_intel = 0);

[5.3044644]

[8.3227]

static corpse_effect_type _determine_chunk_effect(corpse_effect_type chunktype,
                                                  bool rotten_chunk);
static void _eat_chunk(corpse_effect_type chunk_effect, bool cannibal,
                       int mon_intel = 0);

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

B:BD[5.3046568] → [4.2841:2900]

        make_hungry(abs(hunger_difference), suppress_msg);

[5.3046568]

[5.3046629]

        make_hungry(-hunger_difference, suppress_msg);

Deletion in crawl-ref/source/food.cc at line 1108 [5.3043806]
B:BD[3.5125] → [3.5125:5187]
```
        const int chunk_type = mons_corpse_effect(mons_type);
```

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

[9.8459]

[10.424]

        const corpse_effect_type chunk_type = mons_corpse_effect(mons_type);

Deletion in crawl-ref/source/food.cc at line 1139 [5.3043806]
B:BD[11.430560] → [3.5188:5250]
```
        const int chunk_type = mons_corpse_effect(food.plus);
```

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

[9.8876]

[12.10444]

        const corpse_effect_type chunk_type = mons_corpse_effect(food.plus);

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

B:BD[13.5414] → [3.5416:5487]

static void _eat_chunk(int chunk_effect, bool cannibal, int mon_intel)

[13.5414]

[5.3064241]

static void _eat_chunk(corpse_effect_type chunk_effect, bool cannibal,
                       int mon_intel)

Deletion in crawl-ref/source/food.cc at line 1791 [5.3043806]
B:BD[14.4866] → [14.4866:4872]
```
    {
```

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

B:BD[14.5233] → [14.5233:5239]

[14.5233]

[14.5239]


    case CE_MUTAGEN_GOOD:
    case CE_NOCORPSE:
    case CE_RANDOM:
        mprf(MSGCH_ERROR, "This flesh (%d) tastes buggy!", chunk_effect);
        break;

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

B:BD[15.2781] → [16.12501:12577]

static int _determine_chunk_effect(int which_chunk_type, bool rotten_chunk)

[15.2781]

[5.3078926]

static corpse_effect_type _determine_chunk_effect(corpse_effect_type chunktype,
                                                  bool rotten_chunk)

Deletion in crawl-ref/source/food.cc at line 2655 [5.3043806]
∅:D[17.475] → [5.3078983:3079030]
B:BD[5.3078983] → [5.3078983:3079030]
```
    int this_chunk_effect = which_chunk_type;
```
Replacement in crawl-ref/source/food.cc at line 2656 [5.3043806]
∅:D[13.5608] → [5.3079102:3079133]
B:BD[5.3079102] → [5.3079102:3079133]
```
    switch (this_chunk_effect)
```
[13.5608]
[5.3079133]
```
    switch (chunktype)
```
Replacement in crawl-ref/source/food.cc at line 2661 [5.3043806]
∅:D[15.2819] → [5.3079298:3079340]
B:BD[5.3079298] → [5.3079298:3079340]
```
            this_chunk_effect = CE_CLEAN;
```
[15.2819]
[5.3079350]
```
            chunktype = CE_CLEAN;
```
Replacement in crawl-ref/source/food.cc at line 2666 [5.3043806]
∅:D[2.2704] → [5.3079550:3079592]
B:BD[5.3079550] → [5.3079550:3079592]
```
            this_chunk_effect = CE_CLEAN;
```
[2.2704]
[5.3079602]
```
            chunktype = CE_CLEAN;
```

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

B:BD[15.2929] → [15.2929:2975]

                this_chunk_effect = CE_CLEAN;

[15.2929]

[15.2975]

                chunktype = CE_CLEAN;

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

B:BD[15.3047] → [15.3047:3093]

                this_chunk_effect = CE_CLEAN;

[15.3047]

[15.3093]

                chunktype = CE_CLEAN;

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

B:BD[15.3165] → [15.3165:3211]

                this_chunk_effect = CE_CLEAN;

[15.3165]

[15.3211]

                chunktype = CE_CLEAN;

Replacement in crawl-ref/source/food.cc at line 2696 [5.3043806]
B:BD[5.3080627] → [5.3080627:3080662]
```
        switch (this_chunk_effect)
```
[5.3080627]
[5.3080662]
```
        switch (chunktype)
```
Replacement in crawl-ref/source/food.cc at line 2700 [5.3043806]
B:BD[5.3080725] → [5.3080725:3080768]
```
            this_chunk_effect = CE_ROTTEN;
```
[5.3080725]
[5.3080768]
```
            chunktype = CE_ROTTEN;
```
Replacement in crawl-ref/source/food.cc at line 2703 [5.3043806]
B:BD[5.3080819] → [5.3080819:3080867]
```
            this_chunk_effect = CE_MUTAGEN_BAD;
```
[5.3080819]
[5.3080867]
```
            chunktype = CE_MUTAGEN_BAD;
```
Replacement in crawl-ref/source/food.cc at line 2711 [5.3043806]
∅:D[13.5682] → [5.3081012:3081052]
B:BD[5.3081012] → [5.3081012:3081052]
```
    if (this_chunk_effect == CE_ROTTEN)
```
[13.5682]
[5.3081052]
```
    if (chunktype == CE_ROTTEN)
```

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

B:BD[15.3339] → [15.3339:3385]

                this_chunk_effect = CE_CLEAN;

[15.3339]

[15.3385]

                chunktype = CE_CLEAN;

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

B:BD[15.3457] → [15.3457:3503]

                this_chunk_effect = CE_CLEAN;

[15.3457]

[15.3503]

                chunktype = CE_CLEAN;

Replacement in crawl-ref/source/food.cc at line 2740 [5.3043806]
∅:D[18.213] → [5.3081930:3081977]
∅:D[14.6608] → [5.3081930:3081977]
∅:D[19.856294] → [5.3081930:3081977]
B:BD[5.3081930] → [5.3081930:3081977]
B:BD[5.3081977] → [18.214:267]
```
            if (this_chunk_effect == CE_CLEAN)
                this_chunk_effect = CE_CONTAMINATED;
```
[14.6608]
[5.3082024]
```
            if (chunktype == CE_CLEAN)
                chunktype = CE_CONTAMINATED;
```

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

B:BD[19.856426] → [19.856426:856480]

∅:D[19.856480] → [5.3082105:3082151]

B:BD[5.3082105] → [5.3082105:3082151]

            if (this_chunk_effect == CE_CONTAMINATED)
                this_chunk_effect = CE_CLEAN;

[19.856426]

[5.3082151]

            if (chunktype == CE_CONTAMINATED)
                chunktype = CE_CLEAN;

Replacement in crawl-ref/source/food.cc at line 2752 [5.3043806]
B:BD[5.3082168] → [5.3082168:3082200]
```
    return (this_chunk_effect);
```
[5.3082168]
[4.5552]
```
    return (chunktype);
```

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

B:BD[20.18783] → [16.12578:12643]

static bool _vampire_consume_corpse(const int slot, bool invent)

[20.18783]

[21.872]

static bool _vampire_consume_corpse(int slot, bool invent)

Replacement in crawl-ref/source/directn.cc at line 221 [5.3697945]

B:BD[22.1053] → [22.1053:1352]

    case CMD_TARGET_FIND_TRAP:
        return '^';
    case CMD_TARGET_FIND_PORTAL:
        return '\\';
    case CMD_TARGET_FIND_ALTAR:
        return  '_';
    case CMD_TARGET_FIND_UPSTAIR:
        return '<';
    case CMD_TARGET_FIND_DOWNSTAIR:
        return '>';
    default:
        return 0;

[22.1053]

[22.1352]

    case CMD_TARGET_FIND_TRAP:      return '^';
    case CMD_TARGET_FIND_PORTAL:    return '\\';
    case CMD_TARGET_FIND_ALTAR:     return  '_';
    case CMD_TARGET_FIND_UPSTAIR:   return '<';
    case CMD_TARGET_FIND_DOWNSTAIR: return '>';
    default:                        return 0;

More type safety.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/it_use3.cc at line 456 [5.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 463 [5.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 483 [5.2870456]

Deletion in crawl-ref/source/food.cc at line 17 [5.3043806]

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

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

Deletion in crawl-ref/source/food.cc at line 1108 [5.3043806]

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

Deletion in crawl-ref/source/food.cc at line 1139 [5.3043806]

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

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

Deletion in crawl-ref/source/food.cc at line 1791 [5.3043806]

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

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

Deletion in crawl-ref/source/food.cc at line 2655 [5.3043806]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/directn.cc at line 221 [5.3697945]