fiddlerwoaroof/crawl - Change CMNLYUECIMEZSOYG4KOSINOPER5OM7PPCGIHCM7LQVWEO77XFUYQC

Type safety in mutations (mutation.cc probably needs some overhaul...)

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

Created by haranp on July 4, 2007

CMNLYUECIMEZSOYG4KOSINOPER5OM7PPCGIHCM7LQVWEO77XFUYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 528 [3.3]

B:BD[3.17361] → [3.17361:17405]

            if (mutate(100, failMsg, true))

[3.17361]

[3.17405]

            if (mutate(RANDOM_MUTATION, failMsg, true))

Replacement in crawl-ref/source/xom.cc at line 668 [3.3]

B:BD[3.22973] → [3.22973:23021]

                if (mutate(101, failMsg, true))

[3.22973]

[3.23021]

                if (mutate(RANDOM_XOM_MUTATION, failMsg, true))

Replacement in crawl-ref/source/spl-cast.cc at line 1551 [4.293070]
B:BD[4.334600] → [4.334600:334633]
```
        if (!mutate(100, false))
```
[4.334600]
[4.334633]
```
        if (!mutate(RANDOM_MUTATION, false))
```
Replacement in crawl-ref/source/spl-cast.cc at line 2860 [4.293070]
B:BD[4.374995] → [4.374995:375033]
```
                delete_mutation(100);
```
[4.374995]
[4.375033]
```
                delete_mutation(RANDOM_MUTATION);
```
Replacement in crawl-ref/source/player.cc at line 5233 [4.962854]
B:BD[5.108] → [5.108:131]
```
        ::mutate(100);
```
[5.108]
[5.131]
```
        ::mutate(RANDOM_MUTATION);
```

Replacement in crawl-ref/source/notes.cc at line 305 [7.370339]

B:BD[6.2022] → [6.2022:2092]

                   << mutation_name(first, second == 0 ? 1 : second);

[6.2022]

[8.12615]

                   << mutation_name(static_cast<mutation_type>(first),
                                    second == 0 ? 1 : second);

Replacement in crawl-ref/source/notes.cc at line 310 [7.370339]

B:BD[6.2133] → [6.2133:2205]

                   << mutation_name(first, second == 3 ? 3 : second+1);

[6.2133]

[8.12798]

                   << mutation_name(static_cast<mutation_type>(first),
                                    second == 3 ? 3 : second+1);

Replacement in crawl-ref/source/mutation.h at line 25 [4.1260415]
B:BD[4.1261002] → [3.36301:36354]
```
bool mutate(int which_mutation, bool failMsg = true,
```
[4.1261002]
[3.36354]
```
bool mutate(mutation_type which_mutation, bool failMsg = true,
```
Replacement in crawl-ref/source/mutation.h at line 42 [4.1260415]
B:BD[4.1261532] → [9.1303:1345]
```
bool delete_mutation(int which_mutation);
```
[4.1261532]
[4.1261575]
```
bool delete_mutation(mutation_type which_mutation);
```

Replacement in crawl-ref/source/mutation.h at line 50 [4.1260415]

B:BD[4.1261854] → [9.1346:1408]

const char *mutation_name( int which_mutat, int level = -1 );

[4.1261854]

[4.1261917]

const char *mutation_name( mutation_type which_mutat, int level = -1 );

Replacement in crawl-ref/source/mutation.h at line 71 [4.1260415]
B:BD[4.1262958] → [2.1181:1230]
```
bool perma_mutate(int which_mut, char how_much);
```
[4.1262958]
[4.1262958]
```
bool perma_mutate(mutation_type which_mut, int how_much);
```
Replacement in crawl-ref/source/mutation.cc at line 1135 [4.1263003]
∅:D[10.2452] → [11.4246:4286]
B:BD[4.1299321] → [11.4246:4286]
```
            result += mutation_name(i);
```
[10.2452]
[10.2453]
```
            result += mutation_name(static_cast<mutation_type>(i));
```

Replacement in crawl-ref/source/mutation.cc at line 1162 [4.1263003]

B:BD[4.1300382] → [3.36446:36507]

static int calc_mutation_amusement_value(int which_mutation)

[4.1300382]

[4.1300428]

static int calc_mutation_amusement_value(mutation_type which_mutation)

Replacement in crawl-ref/source/mutation.cc at line 1217 [4.1263003]

B:BD[7.395280] → [3.37644:37711]

bool mutate(int which_mutation, bool failMsg, bool force_mutation,

[7.395280]

[3.37711]

static bool accept_mutation( mutation_type mutat )
{
    int limit = 3;
    if ( mutat == MUT_STRONG || mutat == MUT_CLEVER ||
         mutat == MUT_AGILE || mutat == MUT_WEAK ||
         mutat == MUT_DOPEY || mutat == MUT_CLUMSY )
        limit = 14;
    
    if ( you.mutation[mutat] >= limit )
        return false;
    
    const int rarity = mutation_rarity[mutat] + you.demon_pow[mutat];
    // low rarity means unlikely to choose it
    return (rarity > random2(10));
}
bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,

Replacement in crawl-ref/source/mutation.cc at line 1236 [4.1263003]
B:BD[3.37742] → [3.37742:37774]
```
    int mutat = which_mutation;
```
[3.37742]
[3.37774]
```
    mutation_type mutat = which_mutation;
```
Replacement in crawl-ref/source/mutation.cc at line 1286 [4.1263003]
B:BD[4.1301756] → [4.1301756:1301818]
```
    if (which_mutation == 100 && random2(15) < how_mutated())
```
[4.1301756]
[4.1301818]
```
    if (which_mutation == RANDOM_MUTATION)
```

Replacement in crawl-ref/source/mutation.cc at line 1288 [4.1263003]

B:BD[4.1301824] → [4.1301824:1301902]

        if (!force_mutation && !one_chance_in(3))
            return (false);

[4.1301824]

[4.1301902]

        if ( random2(15) < how_mutated() )
        {
            if (!force_mutation && !one_chance_in(3))
                return (false);
            else
                return (delete_mutation(RANDOM_MUTATION));
        }

Deletion in crawl-ref/source/mutation.cc at line 1296 [4.1263003]

B:BD[4.1301915] → [4.1301915:1302013]

            return (delete_mutation(100));
    }
    if (which_mutation == 100)
    {
        do

Replacement in crawl-ref/source/mutation.cc at line 1297 [4.1263003]

B:BD[4.1302023] → [4.1302023:1302135]

            mutat = random2(NUM_MUTATIONS);
            if (one_chance_in(1000))
                return false;

[4.1302023]

[4.1302135]

            do
            {
                mutat = static_cast<mutation_type>(random2(NUM_MUTATIONS));
                if (one_chance_in(1000))
                    return false;
            } while ( !accept_mutation(mutat) );

Deletion in crawl-ref/source/mutation.cc at line 1304 [4.1263003]

B:BD[4.1302145] → [4.1302145:1302579]

        while ((you.mutation[mutat] >= 3
                && (mutat != MUT_STRONG && mutat != MUT_CLEVER
                    && mutat != MUT_AGILE) && (mutat != MUT_WEAK
                                               && mutat != MUT_DOPEY
                                               && mutat != MUT_CLUMSY))
               || you.mutation[mutat] > 13
               || random2(10) >= mutation_rarity[mutat] + you.demon_pow[mutat]);

Replacement in crawl-ref/source/mutation.cc at line 1305 [4.1263003]
B:BD[4.1302585] → [3.37796:37832]
```
    else if (which_mutation == 101)
```
[4.1302585]
[3.37832]
```
    else if (which_mutation == RANDOM_XOM_MUTATION)
```

Replacement in crawl-ref/source/mutation.cc at line 1309 [4.1263003]

B:BD[3.37859] → [3.37859:37903]

            mutat = random2(NUM_MUTATIONS);

[3.37859]

[4.1302585]

            mutat = static_cast<mutation_type>(random2(NUM_MUTATIONS));

Replacement in crawl-ref/source/mutation.cc at line 1328 [4.1263003]

B:BD[3.38533] → [3.38533:38967]

        while ((you.mutation[mutat] >= 3
                && (mutat != MUT_STRONG && mutat != MUT_CLEVER
                    && mutat != MUT_AGILE) && (mutat != MUT_WEAK
                                               && mutat != MUT_DOPEY
                                               && mutat != MUT_CLUMSY))
               || you.mutation[mutat] > 13
               || random2(10) >= mutation_rarity[mutat] + you.demon_pow[mutat]);

[3.38533]

[3.38967]

        while ( !accept_mutation(mutat) );

Replacement in crawl-ref/source/mutation.cc at line 1330 [4.1263003]

B:BD[3.38973] → [3.38973:39210]

    else if (you.mutation[mutat] >= 3
             && (mutat != MUT_STRONG && mutat != MUT_CLEVER
                 && mutat != MUT_AGILE)
             && (mutat != MUT_WEAK && mutat != MUT_DOPEY
                 && mutat != MUT_CLUMSY))

[3.38973]

[4.1302774]

    else if (you.mutation[mutat] >= 3 &&
             mutat != MUT_STRONG && mutat != MUT_CLEVER &&
             mutat != MUT_AGILE && mutat != MUT_WEAK &&
             mutat != MUT_DOPEY && mutat != MUT_CLUMSY)

Replacement in crawl-ref/source/mutation.cc at line 1727 [4.1263003]
B:BD[4.1314573] → [9.1503:1544]
```
bool delete_mutation(int which_mutation)
```
[4.1314573]
[4.1314615]
```
bool delete_mutation(mutation_type which_mutation)
```
Replacement in crawl-ref/source/mutation.cc at line 1729 [4.1263003]
B:BD[4.1314617] → [9.1545:1577]
```
    int mutat = which_mutation;
```
[4.1314617]
[4.1314650]
```
    mutation_type mutat = which_mutation;
```
Replacement in crawl-ref/source/mutation.cc at line 1739 [4.1263003]
B:BD[4.1314868] → [4.1314868:1314899]
```
    if (which_mutation == 100)
```
[4.1314868]
[4.1314899]
```
    if (which_mutation == RANDOM_MUTATION)
```

Replacement in crawl-ref/source/mutation.cc at line 1743 [4.1263003]

B:BD[4.1314926] → [4.1314926:1314970]

            mutat = random2(NUM_MUTATIONS);

[4.1314926]

[4.1314970]

            mutat = static_cast<mutation_type>(random2(NUM_MUTATIONS));

Replacement in crawl-ref/source/mutation.cc at line 1936 [4.1263003]
B:BD[4.1320660] → [9.1578:1633]
```
const char *mutation_name(int which_mutat, int level )
```
[4.1320660]
[4.1320717]
```
const char *mutation_name(mutation_type which_mutat, int level)
```
Replacement in crawl-ref/source/mutation.cc at line 1965 [4.1263003]
B:BD[4.1321722] → [4.1321722:1321743]
```
    int whichm = -1;
```
[4.1321722]
[4.1321743]
```
    mutation_type whichm = NUM_MUTATIONS;
```

Replacement in crawl-ref/source/mutation.cc at line 2089 [4.1263003]

∅:D[7.396446] → [4.1325269:1325349]

B:BD[4.1325269] → [4.1325269:1325349]

        if (whichm != -1 && you.mutation[whichm] != 0)
            whichm = -1;

[7.396446]

[4.1325349]

        if (whichm != NUM_MUTATIONS && you.mutation[whichm] != 0)
            whichm = NUM_MUTATIONS;

Replacement in crawl-ref/source/mutation.cc at line 2092 [4.1263003]

B:BD[4.1325350] → [4.1325350:1325422]

        if (you.experience_level < 10 || (counter > 0 && whichm == -1))

[4.1325350]

[4.1325422]

        if (you.experience_level < 10 ||
            (counter > 0 && whichm == NUM_MUTATIONS))

Replacement in crawl-ref/source/mutation.cc at line 2211 [4.1263003]

B:BD[4.1329231] → [4.1329231:1329290]

                    whichm = MUT_RED_SCALES + random2(16);

[4.1329231]

[4.1329290]

                    whichm = static_cast<mutation_type>(MUT_RED_SCALES +
                                                        random2(16));

Replacement in crawl-ref/source/mutation.cc at line 2260 [4.1263003]

B:BD[4.1330723] → [4.1330723:1330803]

        if (whichm != -1 && you.mutation[whichm] != 0)
            whichm = -1;

[4.1330723]

[4.1330803]

        if (whichm != NUM_MUTATIONS && you.mutation[whichm] != 0)
            whichm = NUM_MUTATIONS;

Replacement in crawl-ref/source/mutation.cc at line 2265 [4.1263003]
B:BD[4.1330829] → [4.1330829:1330873]
```
    while (whichm == -1 && counter < 5000);
```
[4.1330829]
[4.1330873]
```
    while (whichm == NUM_MUTATIONS && counter < 5000);
```
Replacement in crawl-ref/source/mutation.cc at line 2267 [4.1263003]
B:BD[4.1330874] → [4.1330874:1330929]
```
    if (whichm == -1 || !perma_mutate( whichm, howm ))
```
[4.1330874]
[4.1330929]
```
    if (whichm == NUM_MUTATIONS || !perma_mutate( whichm, howm ))
```
Replacement in crawl-ref/source/mutation.cc at line 2278 [4.1263003]
B:BD[4.1331282] → [4.1331282:1331330]
```
bool perma_mutate(int which_mut, char how_much)
```
[4.1331282]
[4.1331330]
```
bool perma_mutate(mutation_type which_mut, int how_much)
```

Replacement in crawl-ref/source/mutation.cc at line 2298 [4.1263003]

B:BD[4.1333501] → [4.1333501:1333595]

    int temp_rand = 0;          // probability determination {dlb}
    int which_bad_one = 0;

[4.1333501]

[4.1333595]

    mutation_type which_bad_one;

Replacement in crawl-ref/source/mutation.cc at line 2300 [4.1263003]
B:BD[4.1333596] → [4.1333596:1333625]
```
    temp_rand = random2(12);
```
[4.1333596]
[4.1333625]
```
    const int temp_rand = random2(12);
```
Replacement in crawl-ref/source/mutation.cc at line 2321 [4.1263003]
B:BD[4.1334563] → [4.1334563:1334586]
```
    int mutation = -1;
```
[4.1334563]
[4.1334586]
```
    mutation_type mutation = NUM_MUTATIONS;
```
Replacement in crawl-ref/source/items.cc at line 2369 [4.2584728]
B:BD[4.2649388] → [4.2649388:2649417]
```
                mutate(100);
```
[4.2649388]
[4.2649417]
```
                mutate(RANDOM_MUTATION);
```
Replacement in crawl-ref/source/it_use2.cc at line 268 [4.2904329]
B:BD[4.2911799] → [4.2911799:2911837]
```
                delete_mutation(100);
```
[4.2911799]
[4.2911837]
```
                delete_mutation(RANDOM_MUTATION);
```
Replacement in crawl-ref/source/it_use2.cc at line 276 [4.2904329]
B:BD[4.2911972] → [4.2911972:2912004]
```
            mutate(100, false);
```
[4.2911972]
[4.2912004]
```
            mutate(RANDOM_MUTATION, false);
```
Replacement in crawl-ref/source/food.cc at line 772 [4.3043806]
B:BD[4.3064735] → [4.3064735:3064760]
```
            mutate(100);
```
[4.3064735]
[3.52135]
```
            mutate(RANDOM_MUTATION);
```
Replacement in crawl-ref/source/enum.h at line 2707 [4.3287960]
B:BD[4.3350099] → [4.3350099:3350117]
```
    NUM_MUTATIONS
```
[4.3350099]
[4.3350117]
```
    NUM_MUTATIONS,
    RANDOM_MUTATION = 100,
    RANDOM_XOM_MUTATION = 101
```
Replacement in crawl-ref/source/debug.cc at line 1321 [4.4016436]
B:BD[4.4060900] → [4.4060900:4060923]
```
    int mutation = -1;
```
[4.4060900]
[4.4060923]
```
    mutation_type mutation = NUM_MUTATIONS;
```

Replacement in crawl-ref/source/debug.cc at line 1326 [4.4016436]

B:BD[4.4061001] → [4.4061001:4061073]

        strncpy( mut_name, mutation_name( i, 1 ), sizeof( mut_name ) );

[4.4061001]

[4.4061073]

        const mutation_type m = static_cast<mutation_type>(i);
        strncpy( mut_name, mutation_name( m, 1 ), sizeof( mut_name ) );

Replacement in crawl-ref/source/debug.cc at line 1333 [4.4016436]
B:BD[4.4061227] → [4.4061227:4061253]
```
            mutation = i;
```
[4.4061227]
[4.4061253]
```
            mutation = m;
```
Replacement in crawl-ref/source/debug.cc at line 1338 [4.4016436]
B:BD[4.4061289] → [4.4061289:4061313]
```
    if (mutation == -1)
```
[4.4061289]
[4.4061313]
```
    if (mutation == NUM_MUTATIONS)
```

Type safety in mutations (mutation.cc probably needs some overhaul...)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 528 [3.3]

Replacement in crawl-ref/source/xom.cc at line 668 [3.3]

Replacement in crawl-ref/source/spl-cast.cc at line 1551 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2860 [4.293070]

Replacement in crawl-ref/source/player.cc at line 5233 [4.962854]

Replacement in crawl-ref/source/notes.cc at line 305 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 310 [7.370339]

Replacement in crawl-ref/source/mutation.h at line 25 [4.1260415]

Replacement in crawl-ref/source/mutation.h at line 42 [4.1260415]

Replacement in crawl-ref/source/mutation.h at line 50 [4.1260415]

Replacement in crawl-ref/source/mutation.h at line 71 [4.1260415]

Replacement in crawl-ref/source/mutation.cc at line 1135 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1162 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1217 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1236 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1286 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1288 [4.1263003]

Deletion in crawl-ref/source/mutation.cc at line 1296 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1297 [4.1263003]

Deletion in crawl-ref/source/mutation.cc at line 1304 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1305 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1309 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1328 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1330 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1727 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1729 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1739 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1743 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1936 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1965 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2089 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2092 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2211 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2260 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2265 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2267 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2278 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2298 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2300 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2321 [4.1263003]

Replacement in crawl-ref/source/items.cc at line 2369 [4.2584728]

Replacement in crawl-ref/source/it_use2.cc at line 268 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 276 [4.2904329]

Replacement in crawl-ref/source/food.cc at line 772 [4.3043806]

Replacement in crawl-ref/source/enum.h at line 2707 [4.3287960]

Replacement in crawl-ref/source/debug.cc at line 1321 [4.4016436]

Replacement in crawl-ref/source/debug.cc at line 1326 [4.4016436]

Replacement in crawl-ref/source/debug.cc at line 1333 [4.4016436]

Replacement in crawl-ref/source/debug.cc at line 1338 [4.4016436]