fiddlerwoaroof/crawl - Change BTO5WE4OEK64DZQVNYLOESM74KKQNE7KSNMQVF5UDB26OBKP7ORQC

Various cleanups and goto elimination.

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

Created by haranp on June 27, 2007

BTO5WE4OEK64DZQVNYLOESM74KKQNE7KSNMQVF5UDB26OBKP7ORQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.h at line 35 [4.395672]

B:BD[4.396900] → [4.396900:396955]

unsigned char read_book( item_def &item, int action );

[4.396900]

[4.396955]

unsigned char read_book( item_def &item, read_book_action_type action );

Replacement in crawl-ref/source/spl-book.h at line 51 [4.395672]

B:BD[4.397570] → [2.1785:1837]

int spellbook_contents( item_def &book, int action,

[4.397570]

[2.1837]

int spellbook_contents( item_def &book, read_book_action_type action,

Replacement in crawl-ref/source/spl-book.cc at line 688 [4.397614]

B:BD[5.189190] → [2.1912:1964]

int spellbook_contents( item_def &book, int action,

[5.189190]

[2.1964]

int spellbook_contents( item_def &book, read_book_action_type action,

Replacement in crawl-ref/source/spl-book.cc at line 1013 [4.397614]

B:BD[4.423092] → [4.423092:423146]

unsigned char read_book( item_def &book, int action )

[4.423092]

[4.423146]

unsigned char read_book( item_def &book, read_book_action_type action )

Replacement in crawl-ref/source/randart.cc at line 859 [4.893152]
B:BD[4.909145] → [4.909145:909184]
```
    const int aclass = item.base_type;
```
[4.909145]
[4.909184]
```
    const object_class_type aclass = item.base_type;
```
Deletion in crawl-ref/source/randart.cc at line 862 [4.893152]
B:BD[4.909223] → [4.909223:909238]
```
    int i = 0;
```
Replacement in crawl-ref/source/randart.cc at line 868 [4.893152]
B:BD[4.909373] → [4.909373:909417]
```
        for (i = 0; i < RA_PROPERTIES; i++)
```
[4.909373]
[4.909417]
```
        for (int i = 0; i < RA_PROPERTIES; i++)
```
Replacement in crawl-ref/source/randart.cc at line 888 [4.893152]
B:BD[4.909929] → [4.909929:909992]
```
    for (i = 0; i < RA_PROPERTIES; i++)
        proprt[i] = 0;
```
[4.909929]
[4.909992]
```
    proprt.init(0);
```
Deletion in crawl-ref/source/randart.cc at line 944 [4.893152]
B:BD[4.911589] → [4.911589:911590]
Deletion in crawl-ref/source/randart.cc at line 979 [4.893152]
B:BD[4.912577] → [4.912577:912578]
B:BD[4.912578] → [6.978:1004]
∅:D[6.1004] → [4.912603:912627]
B:BD[4.912603] → [4.912603:912627]
```
    if (one_chance_in(5))
        goto skip_mods;
```

Replacement in crawl-ref/source/randart.cc at line 980 [4.893152]

B:BD[4.912628] → [4.912628:912686]

B:BD[4.912686] → [6.1005:1044]

∅:D[6.1044] → [4.912725:912823]

B:BD[4.912725] → [4.912725:912823]

    /* AC mod - not for armours or rings of protection */
    if (one_chance_in(4 + power_level)
        && aclass != OBJ_ARMOUR
        && (aclass != OBJ_JEWELLERY || atype != RING_PROTECTION))

[4.912628]

[4.912823]

    if (!one_chance_in(5))

Replacement in crawl-ref/source/randart.cc at line 982 [4.893152]

B:BD[4.912829] → [6.1045:1112]

∅:D[6.1112] → [4.912896:912919]

B:BD[4.912896] → [4.912896:912919]

B:BD[4.912919] → [6.1113:1143]

        proprt[RAP_AC] = 1 + random2(3) + random2(3) + random2(3);
        power_level++;
        if (one_chance_in(4))

[4.912829]

[4.912948]

        /* AC mod - not for armours or rings of protection */
        if (one_chance_in(4 + power_level)
            && aclass != OBJ_ARMOUR
            && (aclass != OBJ_JEWELLERY || atype != RING_PROTECTION))

Replacement in crawl-ref/source/randart.cc at line 987 [4.893152]

B:BD[4.912958] → [6.1144:1216]

∅:D[6.1216] → [4.913030:913057]

B:BD[4.913030] → [4.913030:913057]

            proprt[RAP_AC] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.912958]

[4.913057]

            proprt[RAP_AC] = 1 + random2(3) + random2(3) + random2(3);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_AC] -= 1 + random2(3) + random2(3) + random2(3);
                power_level--;
            }

Deletion in crawl-ref/source/randart.cc at line 995 [4.893152]
B:BD[4.913067] → [4.913067:913073]
```
    }
```

Replacement in crawl-ref/source/randart.cc at line 996 [4.893152]

B:BD[4.913074] → [4.913074:913118]

B:BD[4.913118] → [6.1217:1256]

∅:D[6.1256] → [4.913158:913227]

B:BD[4.913158] → [4.913158:913227]

B:BD[4.913227] → [6.1257:1329]

∅:D[6.1329] → [4.913299:913322]

B:BD[4.913299] → [4.913299:913322]

B:BD[4.913322] → [6.1330:1360]

    /* ev mod - not for rings of evasion */
    if (one_chance_in(4 + power_level)
        && (aclass != OBJ_JEWELLERY || atype != RING_EVASION))
    {
        proprt[RAP_EVASION] = 1 + random2(3) + random2(3) + random2(3);
        power_level++;
        if (one_chance_in(4))

[4.913074]

[4.913351]

        /* ev mod - not for rings of evasion */
        if (one_chance_in(4 + power_level)
            && (aclass != OBJ_JEWELLERY || atype != RING_EVASION))

Replacement in crawl-ref/source/randart.cc at line 1000 [4.893152]

B:BD[4.913361] → [6.1361:1438]

∅:D[6.1438] → [4.913438:913465]

B:BD[4.913438] → [4.913438:913465]

            proprt[RAP_EVASION] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.913361]

[4.913465]

            proprt[RAP_EVASION] = 1 + random2(3) + random2(3) + random2(3);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_EVASION] -= 1 + random2(3) + random2(3)
                    + random2(3);
                power_level--;
            }

Deletion in crawl-ref/source/randart.cc at line 1009 [4.893152]
B:BD[4.913475] → [4.913475:913481]
```
    }
```

Replacement in crawl-ref/source/randart.cc at line 1010 [4.893152]

B:BD[4.913482] → [4.913482:913528]

B:BD[4.913528] → [6.1439:1478]

∅:D[6.1478] → [4.913566:913636]

B:BD[4.913566] → [4.913566:913636]

B:BD[4.913636] → [6.1479:1539]

∅:D[6.1539] → [4.913696:913719]

B:BD[4.913696] → [4.913696:913719]

B:BD[4.913719] → [6.1540:1570]

    /* str mod - not for rings of strength */
    if (one_chance_in(4 + power_level)
        && (aclass != OBJ_JEWELLERY || atype != RING_STRENGTH))
    {
        proprt[RAP_STRENGTH] = 1 + random2(3) + random2(2);
        power_level++;
        if (one_chance_in(4))

[4.913482]

[4.913748]

        /* str mod - not for rings of strength */
        if (one_chance_in(4 + power_level)
            && (aclass != OBJ_JEWELLERY || atype != RING_STRENGTH))

Replacement in crawl-ref/source/randart.cc at line 1014 [4.893152]

B:BD[4.913758] → [6.1571:1649]

∅:D[6.1649] → [4.913836:913863]

B:BD[4.913836] → [4.913836:913863]

            proprt[RAP_STRENGTH] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.913758]

[4.913863]

            proprt[RAP_STRENGTH] = 1 + random2(3) + random2(2);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_STRENGTH] -= 1 + random2(3) + random2(3)
                    + random2(3);
                power_level--;
            }

Deletion in crawl-ref/source/randart.cc at line 1023 [4.893152]
B:BD[4.913873] → [4.913873:913879]
```
    }
```

Replacement in crawl-ref/source/randart.cc at line 1024 [4.893152]

B:BD[4.913880] → [4.913880:913930]

B:BD[4.913930] → [6.1650:1689]

∅:D[6.1689] → [4.913968:914042]

B:BD[4.913968] → [4.913968:914042]

B:BD[4.914042] → [6.1690:1754]

∅:D[6.1754] → [4.914106:914129]

B:BD[4.914106] → [4.914106:914129]

B:BD[4.914129] → [6.1755:1785]

    /* int mod - not for rings of intelligence */
    if (one_chance_in(4 + power_level)
        && (aclass != OBJ_JEWELLERY || atype != RING_INTELLIGENCE))
    {
        proprt[RAP_INTELLIGENCE] = 1 + random2(3) + random2(2);
        power_level++;
        if (one_chance_in(4))

[4.913880]

[4.914158]

        /* int mod - not for rings of intelligence */
        if (one_chance_in(4 + power_level)
            && (aclass != OBJ_JEWELLERY || atype != RING_INTELLIGENCE))

Replacement in crawl-ref/source/randart.cc at line 1028 [4.893152]

B:BD[4.914168] → [6.1786:1868]

∅:D[6.1868] → [4.914250:914277]

B:BD[4.914250] → [4.914250:914277]

            proprt[RAP_INTELLIGENCE] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.914168]

[4.914277]

            proprt[RAP_INTELLIGENCE] = 1 + random2(3) + random2(2);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_INTELLIGENCE] -= 1 + random2(3) + random2(3)
                    + random2(3);
                power_level--;
            }

Deletion in crawl-ref/source/randart.cc at line 1037 [4.893152]
B:BD[4.914287] → [4.914287:914293]
```
    }
```

Replacement in crawl-ref/source/randart.cc at line 1038 [4.893152]

B:BD[4.914294] → [4.914294:914341]

B:BD[4.914341] → [6.1869:1908]

∅:D[6.1908] → [4.914379:914450]

B:BD[4.914379] → [4.914379:914450]

B:BD[4.914450] → [6.1909:1970]

∅:D[6.1970] → [4.914511:914534]

B:BD[4.914511] → [4.914511:914534]

B:BD[4.914534] → [6.1971:2001]

    /* dex mod - not for rings of dexterity */
    if (one_chance_in(4 + power_level)
        && (aclass != OBJ_JEWELLERY || atype != RING_DEXTERITY))
    {
        proprt[RAP_DEXTERITY] = 1 + random2(3) + random2(2);
        power_level++;
        if (one_chance_in(4))

[4.914294]

[4.914563]

        /* dex mod - not for rings of dexterity */
        if (one_chance_in(4 + power_level)
            && (aclass != OBJ_JEWELLERY || atype != RING_DEXTERITY))

Replacement in crawl-ref/source/randart.cc at line 1042 [4.893152]

B:BD[4.914573] → [6.2002:2081]

∅:D[6.2081] → [4.914652:914679]

B:BD[4.914652] → [4.914652:914679]

            proprt[RAP_DEXTERITY] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.914573]

[4.914679]

            proprt[RAP_DEXTERITY] = 1 + random2(3) + random2(2);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_DEXTERITY] -= 1 + random2(3) + random2(3)
                    + random2(3);
                power_level--;
            }

Replacement in crawl-ref/source/randart.cc at line 1053 [4.893152]

B:BD[4.914696] → [4.914696:914709]

B:BD[4.914709] → [6.2082:2117]

∅:D[6.2117] → [4.914744:914840]

B:BD[4.914744] → [4.914744:914840]

  skip_mods:
    if (random2(15) < power_level 
        || aclass == OBJ_WEAPONS
        || (aclass == OBJ_JEWELLERY && atype == RING_SLAYING))

[4.914696]

[4.914840]

    if (random2(15) >= power_level && aclass != OBJ_WEAPONS &&
        (aclass != OBJ_JEWELLERY || atype != RING_SLAYING))

Replacement in crawl-ref/source/randart.cc at line 1056 [4.893152]

B:BD[4.914846] → [4.914846:914934]

B:BD[4.914934] → [6.2118:2172]

∅:D[6.2172] → [4.914987:914993]

B:BD[4.914987] → [4.914987:914993]

B:BD[4.914993] → [6.2173:2233]

∅:D[6.2233] → [4.915053:915076]

B:BD[4.915053] → [4.915053:915076]

B:BD[4.915076] → [6.2234:2264]

        goto skip_combat;
    }
    /* Weapons and rings of slaying can't get these */
    if (one_chance_in(4 + power_level))  /* to-hit */
    {
        proprt[RAP_ACCURACY] = 1 + random2(3) + random2(2);
        power_level++;
        if (one_chance_in(4))

[4.914846]

[4.915105]

        /* Weapons and rings of slaying can't get these */
        if (one_chance_in(4 + power_level))  /* to-hit */

Replacement in crawl-ref/source/randart.cc at line 1059 [4.893152]

B:BD[4.915115] → [6.2265:2343]

∅:D[6.2343] → [4.915193:915220]

B:BD[4.915193] → [4.915193:915220]

            proprt[RAP_ACCURACY] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.915115]

[4.915220]

            proprt[RAP_ACCURACY] = 1 + random2(3) + random2(2);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_ACCURACY] -= 1 + random2(3) + random2(3) +
                    random2(3);
                power_level--;
            }

Deletion in crawl-ref/source/randart.cc at line 1068 [4.893152]
B:BD[4.915230] → [4.915230:915236]
```
    }
```
Replacement in crawl-ref/source/randart.cc at line 1069 [4.893152]
B:BD[4.915237] → [6.2344:2398]
∅:D[6.2398] → [4.915290:915296]
B:BD[4.915290] → [4.915290:915296]
B:BD[4.915296] → [6.2399:2457]
∅:D[6.2457] → [4.915354:915377]
B:BD[4.915354] → [4.915354:915377]
B:BD[4.915377] → [6.2458:2488]
```
    if (one_chance_in(4 + power_level))  /* to-dam */
    {
        proprt[RAP_DAMAGE] = 1 + random2(3) + random2(2);
        power_level++;
        if (one_chance_in(4))
```
[4.915237]
[4.915406]
```
        if (one_chance_in(4 + power_level))  /* to-dam */
```

Replacement in crawl-ref/source/randart.cc at line 1071 [4.893152]

B:BD[4.915416] → [6.2489:2565]

∅:D[6.2565] → [4.915492:915519]

B:BD[4.915492] → [4.915492:915519]

            proprt[RAP_DAMAGE] -= 1 + random2(3) + random2(3) + random2(3);
            power_level--;

[4.915416]

[4.915519]

            proprt[RAP_DAMAGE] = 1 + random2(3) + random2(2);
            power_level++;
            if (one_chance_in(4))
            {
                proprt[RAP_DAMAGE] -= 1 + random2(3) + random2(3) + random2(3);
                power_level--;
            }

Replacement in crawl-ref/source/randart.cc at line 1081 [4.893152]
B:BD[4.915536] → [4.915536:915551]
B:BD[4.915551] → [6.2566:2601]
∅:D[6.2601] → [4.915586:915616]
B:BD[4.915586] → [4.915586:915616]
B:BD[4.915616] → [6.2602:2607]
```
  skip_combat:
    if (random2(12) < power_level)
        goto finished_powers;
    
```
[4.915536]
[6.2607]
```
    bool done_powers = (random2(12 < power_level));
```

Replacement in crawl-ref/source/randart.cc at line 1084 [4.893152]

B:BD[6.2626] → [6.2626:2665]

    if (one_chance_in(4 + power_level)

[6.2626]

[4.915670]

    if (!done_powers
        && one_chance_in(4 + power_level)

Replacement in crawl-ref/source/randart.cc at line 1102 [4.893152]
B:BD[4.916160] → [6.2697:2736]
```
    if (one_chance_in(4 + power_level)
```
[4.916160]
[4.916198]
```
    if (!done_powers
        && one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1120 [4.893152]
∅:D[6.2822] → [4.916723:916753]
B:BD[4.916723] → [4.916723:916753]
```
        goto finished_powers;
```
[6.2822]
[4.916753]
```
        done_powers = true;
```
Replacement in crawl-ref/source/randart.cc at line 1123 [4.893152]
B:BD[4.916773] → [6.2823:2862]
```
    if (one_chance_in(4 + power_level)
```
[4.916773]
[4.916811]
```
    if (!done_powers
        && one_chance_in(4 + power_level)
```

Replacement in crawl-ref/source/randart.cc at line 1131 [4.893152]

B:BD[4.916955] → [4.916955:916972]

B:BD[4.916972] → [6.2863:2902]

/* res_poison */
    if (one_chance_in(5 + power_level)

[4.916955]

[4.917010]

    /* res_poison */
    if (!done_powers
        && one_chance_in(5 + power_level)

Replacement in crawl-ref/source/randart.cc at line 1144 [4.893152]
B:BD[4.917343] → [6.2903:2942]
```
    if (one_chance_in(4 + power_level)
```
[4.917343]
[4.917381]
```
    if (!done_powers
        && one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1156 [4.893152]
B:BD[4.917687] → [6.2943:2982]
```
    if (one_chance_in(4 + power_level)
```
[4.917687]
[4.917725]
```
    if (!done_powers
        && one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1165 [4.893152]
B:BD[4.917904] → [6.3030:3069]
```
    if (one_chance_in(4 + power_level)
```
[4.917904]
[4.917942]
```
    if (!done_powers
        && one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1174 [4.893152]
∅:D[6.3125] → [4.918135:918165]
B:BD[4.918135] → [4.918135:918165]
```
        goto finished_powers;
```
[6.3125]
[4.918165]
```
        done_powers = true;
```
Replacement in crawl-ref/source/randart.cc at line 1177 [4.893152]
B:BD[4.918187] → [6.3126:3152]
```
    if (one_chance_in(10)
```
[4.918187]
[4.918212]
```
    if (!done_powers
        && one_chance_in(10)
```
Replacement in crawl-ref/source/randart.cc at line 1186 [4.893152]
B:BD[4.918370] → [6.3153:3179]
```
    if (one_chance_in(10)
```
[4.918370]
[4.918395]
```
    if (!done_powers
        && one_chance_in(10)
```
Replacement in crawl-ref/source/randart.cc at line 1194 [4.893152]
B:BD[4.918531] → [6.3180:3225]
```
    if (one_chance_in(10))       /* blink */
```
[4.918531]
[4.918575]
```
    if (!done_powers && one_chance_in(10))       /* blink */
```
Replacement in crawl-ref/source/randart.cc at line 1201 [4.893152]
B:BD[4.918661] → [6.3226:3252]
```
    if (one_chance_in(10)
```
[4.918661]
[4.918686]
```
    if (!done_powers
        && one_chance_in(10)
```

Replacement in crawl-ref/source/randart.cc at line 1210 [4.893152]

B:BD[4.918850] → [6.3253:3330]

    if (one_chance_in(10) && (aclass != OBJ_JEWELLERY || atype != AMU_RAGE))

[4.918850]

[4.918926]

    if (!done_powers
        && one_chance_in(10)
        && (aclass != OBJ_JEWELLERY || atype != AMU_RAGE))

Replacement in crawl-ref/source/randart.cc at line 1218 [4.893152]

B:BD[4.918995] → [6.3331:3381]

    if (one_chance_in(10))       /* sense surr */

[4.918995]

[4.919044]

    if (!done_powers && one_chance_in(10))       /* sense surr */

Deletion in crawl-ref/source/randart.cc at line 1224 [4.893152]
B:BD[4.919113] → [4.919113:919133]
```
  finished_powers:
```
Replacement in crawl-ref/source/randart.cc at line 1229 [4.893152]
B:BD[4.919280] → [6.3382:3437]
∅:D[6.3437] → [4.919335:919366]
B:BD[4.919335] → [4.919335:919366]
B:BD[4.919366] → [6.3438:3462]
```
    if (random2(17) >= power_level || power_level < 2)
        goto finished_curses;
    switch (random2(9))
```
[4.919280]
[4.919390]
```
    if (power_level >= 2 && random2(17) < power_level)
```

Replacement in crawl-ref/source/randart.cc at line 1231 [4.893152]

B:BD[4.919396] → [4.919396:919481]

    case 0:                     /* makes noise */
        if (aclass != OBJ_WEAPONS)

[4.919396]

[4.919481]

        switch (random2(9))
        {
        case 0:                     /* makes noise */
            if (aclass != OBJ_WEAPONS)
                break;
            proprt[RAP_NOISES] = 1 + random2(4);
            break;
        case 1:                     /* no magic */
            proprt[RAP_PREVENT_SPELLCASTING] = 1;
            break;
        case 2:                     /* random teleport */
            if (aclass != OBJ_WEAPONS)
                break;
            proprt[RAP_CAUSE_TELEPORTATION] = 5 + random2(15);
            break;
        case 3:   /* no teleport - doesn't affect some instantaneous
                   * teleports */
            if (aclass == OBJ_JEWELLERY && atype == RING_TELEPORTATION)
                break;              /* already is a ring of tport */
            if (aclass == OBJ_JEWELLERY && atype == RING_TELEPORT_CONTROL)
                break;              /* already is a ring of tport ctrl */
            proprt[RAP_BLINK] = 0;
            proprt[RAP_CAN_TELEPORT] = 0;
            proprt[RAP_PREVENT_TELEPORTATION] = 1;

Replacement in crawl-ref/source/randart.cc at line 1256 [4.893152]

B:BD[4.919500] → [6.3463:3508]

∅:D[6.3508] → [4.919545:919757]

B:BD[4.919545] → [4.919545:919757]

        proprt[RAP_NOISES] = 1 + random2(4);
        break;
    case 1:                     /* no magic */
        proprt[RAP_PREVENT_SPELLCASTING] = 1;
        break;
    case 2:                     /* random teleport */
        if (aclass != OBJ_WEAPONS)

[4.919500]

[4.919757]

        case 4:                     /* berserk on attack */
            if (aclass != OBJ_WEAPONS)
                break;
            proprt[RAP_ANGRY] = 1 + random2(8);
            break;
        case 5:                     /* susceptible to fire */
            if (aclass == OBJ_JEWELLERY
                && (atype == RING_PROTECTION_FROM_FIRE || atype == RING_FIRE
                    || atype == RING_ICE))
                break;              /* already does this or something */
            if (aclass == OBJ_ARMOUR
                && (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
                    || atype == ARM_GOLD_DRAGON_ARMOUR))
                break;
            proprt[RAP_FIRE] = -1;

Replacement in crawl-ref/source/randart.cc at line 1272 [4.893152]

B:BD[4.919776] → [6.3509:3568]

∅:D[6.3568] → [4.919835:920424]

B:BD[4.919835] → [4.919835:920424]

        proprt[RAP_CAUSE_TELEPORTATION] = 5 + random2(15);
        break;
    case 3:   /* no teleport - doesn't affect some instantaneous teleports */
        if (aclass == OBJ_JEWELLERY && atype == RING_TELEPORTATION)
            break;              /* already is a ring of tport */
        if (aclass == OBJ_JEWELLERY && atype == RING_TELEPORT_CONTROL)
            break;              /* already is a ring of tport ctrl */
        proprt[RAP_BLINK] = 0;
        proprt[RAP_CAN_TELEPORT] = 0;
        proprt[RAP_PREVENT_TELEPORTATION] = 1;
        break;
    case 4:                     /* berserk on attack */
        if (aclass != OBJ_WEAPONS)

[4.919776]

[4.920424]

        case 6:                     /* susceptible to cold */
            if (aclass == OBJ_JEWELLERY
                && (atype == RING_PROTECTION_FROM_COLD || atype == RING_FIRE
                    || atype == RING_ICE))
                break;              /* already does this or something */
            if (aclass == OBJ_ARMOUR
                && (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
                    || atype == ARM_GOLD_DRAGON_ARMOUR))
                break;
            proprt[RAP_COLD] = -1;

Replacement in crawl-ref/source/randart.cc at line 1283 [4.893152]

B:BD[4.920443] → [6.3569:3613]

∅:D[6.3613] → [4.920487:920940]

B:BD[4.920487] → [4.920487:920940]

        proprt[RAP_ANGRY] = 1 + random2(8);
        break;
    case 5:                     /* susceptible to fire */
        if (aclass == OBJ_JEWELLERY
            && (atype == RING_PROTECTION_FROM_FIRE || atype == RING_FIRE
                || atype == RING_ICE))
            break;              /* already does this or something */
        if (aclass == OBJ_ARMOUR
            && (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
                || atype == ARM_GOLD_DRAGON_ARMOUR))

[4.920443]

[4.920940]

        case 7:                     /* speed metabolism */
            if (aclass == OBJ_JEWELLERY && atype == RING_HUNGER)
                break;              /* already is a ring of hunger */
            if (aclass == OBJ_JEWELLERY && atype == RING_SUSTENANCE)
                break;              /* already is a ring of sustenance */
            proprt[RAP_METABOLISM] = 1 + random2(3);

Replacement in crawl-ref/source/randart.cc at line 1290 [4.893152]

B:BD[4.920959] → [4.920959:921443]

        proprt[RAP_FIRE] = -1;
        break;
    case 6:                     /* susceptible to cold */
        if (aclass == OBJ_JEWELLERY
            && (atype == RING_PROTECTION_FROM_COLD || atype == RING_FIRE
                || atype == RING_ICE))
            break;              /* already does this or something */
        if (aclass == OBJ_ARMOUR
            && (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
                || atype == ARM_GOLD_DRAGON_ARMOUR))

[4.920959]

[4.921443]

        case 8:
            /* emits mutagenic radiation - increases
               magic_contamination.  property is chance (1 in ...) of
               increasing magic_contamination */
            proprt[RAP_MUTAGENIC] = 2 + random2(4);

Replacement in crawl-ref/source/randart.cc at line 1296 [4.893152]

B:BD[4.921462] → [4.921462:921825]

B:BD[4.921825] → [6.3614:3663]

∅:D[6.3663] → [4.921874:922045]

B:BD[4.921874] → [4.921874:922045]

B:BD[4.922045] → [6.3664:3712]

∅:D[6.3712] → [4.922093:922108]

B:BD[4.922093] → [4.922093:922108]

        proprt[RAP_COLD] = -1;
        break;
    case 7:                     /* speed metabolism */
        if (aclass == OBJ_JEWELLERY && atype == RING_HUNGER)
            break;              /* already is a ring of hunger */
        if (aclass == OBJ_JEWELLERY && atype == RING_SUSTENANCE)
            break;              /* already is a ring of sustenance */
        proprt[RAP_METABOLISM] = 1 + random2(3);
        break;
    case 8:   /* emits mutagenic radiation - increases magic_contamination */
        /* property is chance (1 in ...) of increasing magic_contamination */
        proprt[RAP_MUTAGENIC] = 2 + random2(4);
        break;

[4.921462]

[4.922108]

Deletion in crawl-ref/source/randart.cc at line 1298 [4.893152]
B:BD[4.922114] → [4.922114:922174]
```
/*
   26 - +to-hit (no wpns)
   27 - +to-dam (no wpns)
 */
```
Deletion in crawl-ref/source/randart.cc at line 1299 [4.893152]
B:BD[4.922175] → [4.922175:922192]
```
finished_curses:
```

Insertion in crawl-ref/source/newgame.cc at line 136 [4.1132300]

[5.214742]

static species_type random_draconian_species()
{
    return static_cast<species_type>(SP_RED_DRACONIAN + random2(9));
}

Replacement in crawl-ref/source/newgame.cc at line 281 [4.1132300]

B:BD[4.1138827] → [7.1827:1907]

        you.species = static_cast<species_type>(SP_RED_DRACONIAN + random2(9));

[4.1138827]

[4.1138880]

        you.species = random_draconian_species();

Replacement in crawl-ref/source/newgame.cc at line 2887 [4.1132300]
B:BD[3.516] → [3.516:560]
```
        rc = SP_RED_DRACONIAN + random2(9);
```
[3.516]
[3.560]
```
        rc = random_draconian_species();
```

Replacement in crawl-ref/source/dungeon.cc at line 706 [4.3429798]

B:BD[8.5670] → [8.5670:5786]

// count how many neighbours of grd[x][y] are the feature feat.
static int count_neighbours(int x, int y, int feat)

[8.5670]

[8.5786]

static int count_feature_in_box(int x0, int y0, int x1, int y1,
                                dungeon_feature_type feat)

Replacement in crawl-ref/source/dungeon.cc at line 710 [4.3429798]

B:BD[8.5808] → [8.5808:5925]

    for ( int i = -1; i <= 1; ++i )
        for ( int j = -1; j <= 1; ++j )
            if ( grd[x+i][y+j] == feat )

[8.5808]

[8.5925]

    for ( int i = x0; i < x1; ++i )
        for ( int j = y0; j < y1; ++j )
            if ( grd[i][j] == feat )

Insertion in crawl-ref/source/dungeon.cc at line 715 [4.3429798]

[8.5970]

}
static int count_antifeature_in_box(int x0, int y0, int x1, int y1,
                                    dungeon_feature_type feat)
{
    return (x1-x0)*(y1-y0) - count_feature_in_box(x0,y0,x1,y1,feat);
}
// count how many neighbours of grd[x][y] are the feature feat.
static int count_neighbours(int x, int y, dungeon_feature_type feat)
{
    return count_feature_in_box(x-1, y-1, x+2, y+2, feat);

Deletion in crawl-ref/source/dungeon.cc at line 3762 [4.3429798]

B:BD[4.3615344] → [4.3615344:3615484]

    int pools = 0;
    int i = 0, j = 0, k = 0, l = 0;
    int m = 0, n = 0;
    int no_pools = 20 + random2avg(9, 2);
    int timeout = 0;

Replacement in crawl-ref/source/dungeon.cc at line 3768 [4.3429798]
B:BD[4.3615647] → [4.3615647:3615679]
```
    do
    {
        timeout++;
```
[4.3615647]
[4.3615679]
```
    const int num_pools = 20 + random2avg(9, 2);
    int pools = 0;
```

Replacement in crawl-ref/source/dungeon.cc at line 3771 [4.3429798]

B:BD[4.3615680] → [4.3615680:3615729]

        if (timeout >= 30000)
            break;

[4.3615680]

[4.3615729]

    for ( int timeout = 0; pools < num_pools && timeout < 30000; ++timeout )
    {
        const int i = 6 + random2( GXM - 26 );
        const int j = 6 + random2( GYM - 26 );
        const int k = i + 2 + roll_dice( 2, 9 );
        const int l = j + 2 + roll_dice( 2, 9 );

Replacement in crawl-ref/source/dungeon.cc at line 3778 [4.3429798]

B:BD[4.3615730] → [4.3615730:3615915]

        i = 6 + random2( GXM - 26 );
        j = 6 + random2( GYM - 26 );
        k = i + 2 + roll_dice( 2, 9 );
        l = j + 2 + roll_dice( 2, 9 );
        for (m = i; m < k; m++)

[4.3615730]

[4.3615915]

        if ( count_antifeature_in_box(i, j, k, l, DNGN_FLOOR) == 0 )

Replacement in crawl-ref/source/dungeon.cc at line 3780 [4.3429798]

B:BD[4.3615925] → [4.3615925:3616075]

            for (n = j; n < l; n++)
            {
                if (grd[m][n] != DNGN_FLOOR)
                    goto continue_pools;
            }

[4.3615925]

[4.3616075]

            place_pool(pool_type, i, j, k, l);
            pools++;

Deletion in crawl-ref/source/dungeon.cc at line 3783 [4.3429798]

B:BD[4.3616085] → [4.3616085:3616187]


        place_pool(pool_type, i, j, k, l);
        pools++;
      continue_pools:
        continue;

Deletion in crawl-ref/source/dungeon.cc at line 3784 [4.3429798]
B:BD[4.3616193] → [4.3616193:3616223]
```
    while (pools < no_pools);
```
Replacement in crawl-ref/source/dungeon.cc at line 3880 [4.3429798]
B:BD[4.3637744] → [4.3637744:3637796]
B:BD[4.3637796] → [9.1358:1419]
∅:D[9.1419] → [4.3637834:3637851]
B:BD[4.3637834] → [4.3637834:3637851]
```
    int px, py;
    int i, j;
    int k = 0, l = 0;
    const dungeon_feature_type altar_type = pick_an_altar();
    while(true)
```
[4.3637744]
[4.3637851]
```
    for ( int numtry = 0; numtry < 5000; ++numtry )
```
Replacement in crawl-ref/source/dungeon.cc at line 3882 [4.3429798]
B:BD[4.3637857] → [4.3637857:3637872]
```
      rand_px:
```
[4.3637857]
[4.3637872]
```
        int px = 15 + random2(55);
        int py = 15 + random2(45);
```

Replacement in crawl-ref/source/dungeon.cc at line 3885 [4.3429798]

B:BD[4.3637873] → [4.3637873:3637948]

        px = 15 + random2(55);
        py = 15 + random2(45);
        k++;

[4.3637873]

[4.3637948]

        const int numfloors = count_feature_in_box(px-2, py-2, px+3, py+3,
                                                   DNGN_FLOOR);
        const int numgood =
            count_feature_in_box(px-2, py-2, px+3, py+3, DNGN_ROCK_WALL) +
            count_feature_in_box(px-2, py-2, px+3, py+3, DNGN_CLOSED_DOOR) +
            count_feature_in_box(px-2, py-2, px+3, py+3, DNGN_SECRET_DOOR) +
            count_feature_in_box(px-2, py-2, px+3, py+3, DNGN_FLOOR);

Replacement in crawl-ref/source/dungeon.cc at line 3893 [4.3429798]

B:BD[4.3637949] → [4.3637949:3637992]

        if (k == 5000)
            return;

[4.3637949]

[4.3637992]

        if ( numgood < 5*5 || numfloors == 0 )
            continue;

Replacement in crawl-ref/source/dungeon.cc at line 3896 [4.3429798]
B:BD[4.3637993] → [4.3637993:3638008]
```
        l = 0;
```
[4.3637993]
[4.3638008]
```
        bool mon_there;
```

Replacement in crawl-ref/source/dungeon.cc at line 3898 [4.3429798]

B:BD[4.3638009] → [4.3638009:3638191]

        for (i = px - 2; i < px + 3; i++)
        {
            for (j = py - 2; j < py + 3; j++)
            {
                if (grd[i][j] == DNGN_FLOOR)
                    l++;

[4.3638009]

[4.3638191]

        for (int i = px - 2; i <= px + 2; i++)
            for (int j = py - 2; j <= py + 2; j++)
                if (mgrd[i][j] != NON_MONSTER)
                    mon_there = true;

Replacement in crawl-ref/source/dungeon.cc at line 3903 [4.3429798]

B:BD[4.3638192] → [4.3638192:3638551]

                if ((grd[i][j] != DNGN_ROCK_WALL
                        && grd[i][j] != DNGN_CLOSED_DOOR
                        && grd[i][j] != DNGN_SECRET_DOOR
                        && grd[i][j] != DNGN_FLOOR)
                    || mgrd[i][j] != NON_MONSTER)
                {
                    goto rand_px;
                }
            }
        }

[4.3638192]

[4.3638551]

        if ( mon_there )
            continue;

Replacement in crawl-ref/source/dungeon.cc at line 3906 [4.3429798]

B:BD[4.3638552] → [4.3638552:3638711]

        if (l == 0)
            goto rand_px;
        for (i = px - 2; i < px + 3; i++)
        {
            for (j = py - 2; j < py + 3; j++)
            {

[4.3638552]

[4.3638711]

        for (int i = px - 2; i <= px + 2; i++)
            for (int j = py - 2; j <= py + 2; j++)

Replacement in crawl-ref/source/dungeon.cc at line 3909 [4.3429798]

B:BD[4.3638751] → [4.3638751:3638827]

            }
        }
        grd[px][py] = altar_type;
        return;

[4.3638751]

[4.3638827]

        grd[px][py] = pick_an_altar();
        break;

Deletion in crawl-ref/source/dungeon.cc at line 4376 [4.3429798]
B:BD[4.3652177] → [4.3652177:3652196]
```
    char cnx, cny;
```

Replacement in crawl-ref/source/dungeon.cc at line 4394 [4.3429798]

B:BD[4.3652700] → [4.3652700:3653174]

            for (cnx = romx1[which_room] - 1; cnx < romx2[which_room] + 1;
                                                                        cnx++)
            {
                for (cny = romy1[which_room] - 1; cny < romy2[which_room] + 1;
                                                                        cny++)
                {
                    if (grd[cnx][cny] != DNGN_ROCK_WALL)
                        goto continuing;
                }
            }

[4.3652700]

[4.3653174]

            int bx = romx1[which_room], by = romy1[which_room];
            if (count_antifeature_in_box(bx-1,by-1,bx+2,by+2,DNGN_ROCK_WALL))
                continue;

Replacement in crawl-ref/source/dungeon.cc at line 4400 [4.3429798]

B:BD[4.3653263] → [4.3653263:3653330]

                   romy2[which_room], DNGN_ROCK_WALL, DNGN_FLOOR);

[4.3653263]

[4.3653330]

                     romy2[which_room], DNGN_ROCK_WALL, DNGN_FLOOR);

Deletion in crawl-ref/source/dungeon.cc at line 4426 [4.3429798]
B:BD[4.3654173] → [4.3654173:3654209]
```
      continuing:
        continue;
```
Deletion in crawl-ref/source/dungeon.cc at line 4466 [4.3429798]
B:BD[4.3655461] → [4.3655461:3655480]
```
    char cnx, cny;
```

Replacement in crawl-ref/source/dungeon.cc at line 4502 [4.3429798]

B:BD[4.3656682] → [4.3656682:3656984]

                    && b1y <= forbid_y2 && b1y >= forbid_y1)
            {
                goto continuing;
            }
            else if (b2x <= forbid_x2 && b2x >= forbid_x1
                    && b2y <= forbid_y2 && b2y >= forbid_y1)
            {
                goto continuing;
            }

[4.3656682]

[4.3656984]

                && b1y <= forbid_y2 && b1y >= forbid_y1)
                continue;
            if (b2x <= forbid_x2 && b2x >= forbid_x1
                && b2y <= forbid_y2 && b2y >= forbid_y1)
                continue;

Replacement in crawl-ref/source/dungeon.cc at line 4510 [4.3429798]

B:BD[4.3656995] → [4.3656995:3657233]

        for (cnx = b1x - 1; cnx < b2x + 1; cnx++)
        {
            for (cny = b1y - 1; cny < b2y + 1; cny++)
            {
                if (grd[cnx][cny] != DNGN_FLOOR)
                    goto continuing;
            }
        }

[4.3656995]

[4.3657233]

        if (count_antifeature_in_box(b1x-1, b1y-1, b2x+1, b2y+1, DNGN_FLOOR))
            continue;

Deletion in crawl-ref/source/dungeon.cc at line 4533 [4.3429798]
B:BD[4.3658048] → [4.3658048:3658085]
```
      continuing:
        continue;
```
Replacement in crawl-ref/source/describe.cc at line 5043 [4.3736416]
B:BD[4.3943486] → [4.3943486:3943513]
```
        goto end_god_info;
```
[4.3943486]
[4.3943513]
```
        getch();
        return;
```
Deletion in crawl-ref/source/describe.cc at line 5326 [4.3736416]
B:BD[4.3962557] → [4.3962557:3962558]
Deletion in crawl-ref/source/describe.cc at line 5327 [4.3736416]
B:BD[4.3962559] → [4.3962559:3962623]
```
end_god_info: //end of everything (life, world, universe etc.)
```
Insertion in crawl-ref/source/beam.cc at line 3721 [4.4128068]
[4.4242412]
[4.4242412]
```
    bool death_check = false;
```
Replacement in crawl-ref/source/beam.cc at line 3811 [4.4128068]
B:BD[4.4244323] → [4.4244323:4244348]
```
        goto deathCheck;
```
[4.4244323]
[4.4244348]
```
        death_check = true;
```
Replacement in crawl-ref/source/beam.cc at line 3890 [4.4128068]
B:BD[4.4246511] → [4.4246511:4246536]
```
        goto deathCheck;
```
[4.4246511]
[4.4246536]
```
        death_check = true;
```
Replacement in crawl-ref/source/beam.cc at line 3900 [4.4128068]
B:BD[4.4246778] → [4.4246778:4246803]
```
        goto deathCheck;
```
[4.4246778]
[4.4246803]
```
        death_check = true;
```

Replacement in crawl-ref/source/beam.cc at line 3938 [4.4128068]

B:BD[4.4247560] → [4.4247560:4247611]

    return (mons_ench_f2(mon, beam));
deathCheck:

[4.4247560]

[4.4247716]

    if ( !death_check )
        return (mons_ench_f2(mon, beam));

Various cleanups and goto elimination.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.h at line 35 [4.395672]

Replacement in crawl-ref/source/spl-book.h at line 51 [4.395672]

Replacement in crawl-ref/source/spl-book.cc at line 688 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1013 [4.397614]

Replacement in crawl-ref/source/randart.cc at line 859 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 862 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 868 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 888 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 944 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 979 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 980 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 982 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 987 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 995 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 996 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1000 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1009 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1010 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1014 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1023 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1024 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1028 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1037 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1038 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1042 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1053 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1056 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1059 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1068 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1069 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1071 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1081 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1084 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1102 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1120 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1123 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1131 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1144 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1156 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1165 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1174 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1177 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1186 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1194 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1201 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1210 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1218 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1224 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1229 [4.893152]