fiddlerwoaroof/crawl - Change KKNUX66ORZWWQH4ARKCHPHNDOYCI65STE3A27LKA3FWUKIX7MAXQC

Update documentation on coding conventions, and apply a few of them. :)

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

Created by j-p-e-g on May 27, 2008

KKNUX66ORZWWQH4ARKCHPHNDOYCI65STE3A27LKA3FWUKIX7MAXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 329 [7.1132300]

B:BD[6.3115] → [6.3115:3309]

         if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[i][0] )
             && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[i][1] ))
         {
             break;
         }

[6.3115]

[6.3309]

        if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[i][0] )
            && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[i][1] ))
        {
            break;
        }

Replacement in crawl-ref/source/newgame.cc at line 560 [7.1132300]

B:BD[7.1136873] → [7.1136873:1137010]

        || (you.skills[SK_FIRE_MAGIC] == you.skills[SK_ICE_MAGIC]
            && you.skills[SK_AIR_MAGIC] > you.skills[SK_EARTH_MAGIC]))

[7.1136873]

[7.1137010]

        || you.skills[SK_FIRE_MAGIC] == you.skills[SK_ICE_MAGIC]
           && you.skills[SK_AIR_MAGIC] > you.skills[SK_EARTH_MAGIC])

Replacement in crawl-ref/source/mutation.cc at line 1261 [7.1263003]

B:BD[8.508] → [5.2558:2622]

    if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE)

[8.508]

[5.2622]

    if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE

Replacement in crawl-ref/source/dungeon.cc at line 800 [7.3429798]

B:BD[7.3437331] → [2.302:375]

∅:D[2.375] → [9.4769:4816]

B:BD[7.3437393] → [9.4769:4816]

B:BD[9.4816] → [10.1321:1367]

        // do 'normal' building.  Well, except for the swamp and shoals.
        if (!player_in_branch(BRANCH_SWAMP) &&
            !player_in_branch(BRANCH_SHOALS))

[7.3437331]

[11.15159]

        // Do 'normal' building.  Well, except for the swamp and shoals.
        if (!player_in_branch(BRANCH_SWAMP)
            && !player_in_branch(BRANCH_SHOALS))
        {

Insertion in crawl-ref/source/dungeon.cc at line 805 [7.3429798]
[11.15231]
[7.3437511]
```
        }
```
Replacement in crawl-ref/source/dungeon.cc at line 856 [7.3429798]
B:BD[7.3440237] → [7.3440237:3440279]
```
        // always the case with Dis {dlb}
```
[7.3440237]
[12.9136]
```
        // Always the case with Dis {dlb}
```
Replacement in crawl-ref/source/dungeon.cc at line 864 [7.3429798]
B:BD[7.3440431] → [13.11912:11942]
```
            if ( bdepth > 2 )
```
[7.3440431]
[7.3440500]
```
            if (bdepth > 2)
```
Replacement in crawl-ref/source/dungeon.cc at line 867 [7.3429798]
B:BD[7.3440547] → [13.11943:11973]
```
            if ( bdepth > 4 )
```
[7.3440547]
[7.3440616]
```
            if (bdepth > 4)
```
Replacement in crawl-ref/source/dungeon.cc at line 870 [7.3429798]
B:BD[7.3440663] → [13.11974:12024]
```
            if ( bdepth > 6 && one_chance_in(10))
```
[7.3440663]
[7.3440783]
```
            if (bdepth > 6 && one_chance_in(10))
```

Replacement in crawl-ref/source/dungeon.cc at line 886 [7.3429798]

B:BD[7.3441150] → [14.410:464]

∅:D[14.464] → [15.202:284]

B:BD[13.12098] → [15.202:284]

    if ( your_branch().exit_stairs != NUM_FEATURES &&
         player_branch_depth() == 1 &&
         you.level_type == LEVEL_DUNGEON )

[7.3441150]

[7.3441178]

    if (your_branch().exit_stairs != NUM_FEATURES
        && player_branch_depth() == 1
        && you.level_type == LEVEL_DUNGEON)

Insertion in crawl-ref/source/dungeon.cc at line 897 [7.3429798]
[16.4763]
[17.6191]
```
                    {
```
Insertion in crawl-ref/source/dungeon.cc at line 901 [7.3429798]
[16.4934]
[16.4934]
```
                    }
```

Replacement in crawl-ref/source/dungeon.cc at line 1008 [7.3429798]

B:BD[4.3008] → [4.3008:3125]

                    if (preserve_vault_stairs &&
                        (dgn_Map_Mask(stair_list[s2]) & MMT_VAULT))

[4.3008]

[4.3125]

                    if (preserve_vault_stairs
                        && (dgn_Map_Mask(stair_list[s2]) & MMT_VAULT))

Replacement in crawl-ref/source/dungeon.cc at line 1015 [7.3429798]

B:BD[18.2616] → [18.2616:2652]

                        in_bounds);

[18.2616]

[18.2652]

                                                                 in_bounds);

Replacement in crawl-ref/source/dungeon.cc at line 1103 [7.3429798]

B:BD[18.3987] → [3.13201:13251]

∅:D[3.13251] → [18.4038:4088]

B:BD[18.4038] → [18.4038:4088]

            ASSERT(grd(stair_list[s2]) >= base &&
                grd(stair_list[s2]) <= base + 3);

[18.3987]

[18.4088]

            ASSERT(grd(stair_list[s2]) >= base
                   && grd(stair_list[s2]) <= base + 3);

Replacement in crawl-ref/source/dungeon.cc at line 1365 [7.3429798]

B:BD[7.3549220] → [7.3549220:3549295]

            // only one out of four doors are candidates for hiding {gdl}:

[7.3549220]

[19.237]

            // Only one out of four doors are candidates for hiding {gdl}:

Replacement in crawl-ref/source/dungeon.cc at line 1514 [7.3429798]

B:BD[9.7663] → [9.7663:7722]

            if ( random2(num_islands) && island_distance )

[9.7663]

[9.7722]

            if (random2(num_islands) && island_distance)

Replacement in crawl-ref/source/dungeon.cc at line 1517 [7.3429798]
B:BD[11.18516] → [11.18516:18546]
```
        while ( !centre_ok );
```
[11.18516]
[3.13456]
```
        while (!centre_ok);
```
Replacement in crawl-ref/source/dungeon.cc at line 1980 [7.3429798]
∅:D[3.13667] → [20.53348:53411]
B:BD[21.148880] → [20.53348:53411]
```
    // disallow entry vaults for tutorial (complicates things)
```
[3.13667]
[21.148880]
```
    // Disallow entry vaults for tutorial (only complicates things).
```

Replacement in crawl-ref/source/dungeon.cc at line 1991 [7.3429798]

B:BD[21.149070] → [14.711:771]

// returns BUILD_SKIP if we should skip further generation,

[21.149070]

[14.771]

// Returns BUILD_SKIP if we should skip further generation,

Replacement in crawl-ref/source/dungeon.cc at line 2057 [7.3429798]

B:BD[22.33353] → [22.33353:33416]

    while ((chance && random2(100) < chance) || nvaults-- > 0)

[22.33353]

[23.148299]

    while (chance && random2(100) < chance || nvaults-- > 0)

Replacement in crawl-ref/source/dungeon.cc at line 2192 [7.3429798]
B:BD[7.3561890] → [7.3561890:3561923]
```
    int doorlevel = random2(11);
```
[7.3561890]
[7.3561923]
```
    int doorlevel  = random2(11);
```
Replacement in crawl-ref/source/dungeon.cc at line 2194 [7.3429798]
B:BD[7.3561961] → [7.3561961:3562009]
```
    int roomsize = 4 + random2(5) + random2(6);
```
[7.3561961]
[7.3562009]
```
    int roomsize   = 4 + random2(5) + random2(6);
```

Replacement in crawl-ref/source/dungeon.cc at line 2339 [7.3429798]

∅:D[11.23935] → [7.3565925:3566001]

B:BD[7.3565925] → [7.3565925:3566001]

                                                       : DNGN_DEEP_WATER );

[11.23935]

[3.13743]

                                                        : DNGN_DEEP_WATER );

Replacement in crawl-ref/source/abl-show.cc at line 854 [7.4494389]
B:BD[7.4507284] → [24.14624:14668]
```
        if ( keyin == '?' || keyin == '*' )
```
[7.4507284]
[7.4507486]
```
        if (keyin == '?' || keyin == '*')
```

Replacement in crawl-ref/source/abl-show.cc at line 863 [7.4494389]

B:BD[7.4507642] → [24.14723:14824]

        else if (keyin == ESCAPE || keyin == ' ' ||
                 keyin == '\r' || keyin == '\n')

[7.4507642]

[7.4507743]

        else if (keyin == ESCAPE || keyin == ' '
                 || keyin == '\r' || keyin == '\n')

Update documentation on coding conventions, and apply a few of them. :)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/newgame.cc at line 329 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 560 [7.1132300]

Replacement in crawl-ref/source/mutation.cc at line 1261 [7.1263003]

Replacement in crawl-ref/source/dungeon.cc at line 800 [7.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 805 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 856 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 864 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 867 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 870 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 886 [7.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 897 [7.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 901 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1008 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1015 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1103 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1365 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1514 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1517 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1980 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1991 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2057 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2192 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2194 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2339 [7.3429798]

Replacement in crawl-ref/source/abl-show.cc at line 854 [7.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 863 [7.4494389]