fiddlerwoaroof/crawl - Change KKROXTUPBNEXXEUUDJNADATK3BCQPSQWFZ6L4VTKBPTYXJLYUHDQC

Removed pointless *level_builder_function from branches[].

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

Created by haranp on April 10, 2007

KKROXTUPBNEXXEUUDJNADATK3BCQPSQWFZ6L4VTKBPTYXJLYUHDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 139 [6.3429798]
B:BD[6.3434451] → [6.3434451:3434511]
```
static unsigned char item_in_shop(unsigned char shop_type);
```
[6.3434328]
[6.3434511]
```
static object_class_type item_in_shop(unsigned char shop_type);
```
Replacement in crawl-ref/source/dungeon.cc at line 169 [6.3429798]
B:BD[6.3435738] → [6.3435738:3435770]
```
static int pick_an_altar(void);
```
[6.3435738]
[6.3435770]
```
static dungeon_feature_type pick_an_altar(void);
```

Insertion in crawl-ref/source/dungeon.cc at line 418 [6.3429798]

[7.4224]

[8.1005]

static int num_items_wanted(int level_number)
{
    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
        return 10 + random2avg( 90, 2 );  // rich level!
    else
        return 3 + roll_dice( 3, 11 );
}

Deletion in crawl-ref/source/dungeon.cc at line 563 [6.3429798]

B:BD[8.2644] → [8.2644:2825]

    int items_wanted = 3 + roll_dice( 3, 11 );
    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
        items_wanted = 10 + random2avg( 90, 2 );  // rich level!

Replacement in crawl-ref/source/dungeon.cc at line 568 [6.3429798]

B:BD[8.3069] → [8.3069:3128]

    builder_items(level_number, level_type, items_wanted);

[8.3069]

[8.3128]

    builder_items(level_number, level_type, num_items_wanted(level_number));

Replacement in crawl-ref/source/dungeon.cc at line 598 [6.3429798]
B:BD[9.1081] → [9.1081:1110]
```
    item.plus  = item.plus2;
```
[9.1081]
[2.191]
```
    item.plus = item.plus2;
```
Deletion in crawl-ref/source/dungeon.cc at line 627 [6.3429798]
B:BD[4.1964] → [4.1964:2010]
```
           const dgn_region_list &forbidden) 
```
Insertion in crawl-ref/source/dungeon.cc at line 628 [6.3429798]
[6.3444101]
[6.3444101]
```
           const dgn_region_list &forbidden) 
```
Replacement in crawl-ref/source/dungeon.cc at line 2736 [6.3429798]
B:BD[6.3518730] → [3.1562:1604]
```
    const int mholy = mons_holiness(mon);
```
[6.3518730]
[3.1604]
```
    const mon_holy_type mholy = mons_holiness(mon);
```

Replacement in crawl-ref/source/dungeon.cc at line 4785 [6.3429798]

B:BD[6.3577578] → [5.2236:2297]

static int place_monster_vector(int* montypes, int numtypes,

[6.3577578]

[5.2297]

static int place_monster_vector(std::vector<int> montypes,

Replacement in crawl-ref/source/dungeon.cc at line 4792 [6.3429798]

B:BD[6.3578012] → [5.2453:2519]

        if (place_monster( not_used, montypes[random2(numtypes)],

[6.3578012]

[5.2519]

        if (place_monster( not_used, montypes[random2((int)montypes.size())],

Replacement in crawl-ref/source/dungeon.cc at line 4807 [6.3429798]
B:BD[5.2891] → [5.2891:2919]
```
    int swimming_things[4];
```
[5.2891]
[6.3579459]
```
    std::vector<int> swimming_things(4u, NON_MONSTER);
```

Replacement in crawl-ref/source/dungeon.cc at line 4830 [6.3429798]

B:BD[6.3580350] → [5.3197:3260]

        place_monster_vector(swimming_things, 4, level_number,

[6.3580350]

[5.3260]

        place_monster_vector(swimming_things, level_number,

Replacement in crawl-ref/source/dungeon.cc at line 4850 [6.3429798]

B:BD[5.3429] → [5.3429:3492]

        place_monster_vector(swimming_things, 4, level_number,

[5.3429]

[5.3492]

        place_monster_vector(swimming_things, level_number,

Replacement in crawl-ref/source/dungeon.cc at line 7285 [6.3429798]
B:BD[6.3634590] → [6.3634590:3634621]
```
static int pick_an_altar(void)
```
[6.3634590]
[6.3634621]
```
static dungeon_feature_type pick_an_altar(void)
```
Replacement in crawl-ref/source/dungeon.cc at line 7287 [6.3429798]
B:BD[6.3634623] → [6.3634623:3634647]
```
    int altar_type = 0;
```
[6.3634623]
[6.3634647]
```
    dungeon_feature_type altar_type;
```

Replacement in crawl-ref/source/dungeon.cc at line 7346 [6.3429798]

B:BD[6.3636775] → [6.3636775:3636844]

                altar_type = DNGN_ALTAR_ZIN + random2(NUM_GODS - 1);

[6.3636775]

[6.3636844]

                altar_type =
                    static_cast<dungeon_feature_type>(DNGN_ALTAR_ZIN +
                                                      random2(NUM_GODS - 1));

Replacement in crawl-ref/source/dungeon.cc at line 7357 [6.3429798]

B:BD[6.3636968] → [6.3636968:3637034]

        // Note: this case includes the pandemonium or the abyss.

[6.3636968]

[6.3637034]

        // Note: this case includes Pandemonium or the Abyss.

Replacement in crawl-ref/source/dungeon.cc at line 7379 [6.3429798]
B:BD[6.3637796] → [6.3637796:3637834]
```
    int altar_type = pick_an_altar();
```
[6.3637796]
[6.3637834]
```
    const dungeon_feature_type altar_type = pick_an_altar();
```
Replacement in crawl-ref/source/dungeon.cc at line 7588 [6.3429798]
B:BD[6.3643027] → [6.3643027:3643086]
```
static unsigned char item_in_shop(unsigned char shop_type)
```
[6.3643027]
[6.3643086]
```
static object_class_type item_in_shop(unsigned char shop_type)
```
Deletion in crawl-ref/source/branch.h at line 34 [10.13240]
B:BD[10.14130] → [10.14130:14171]
```
    void (*level_builder_function)(int);
```
Replacement in crawl-ref/source/branch.cc at line 22 [10.14355]
∅:D[8.5150] → [10.14744:14797]
B:BD[10.14744] → [10.14744:14797]
```
      mons_standard_rare, mons_standard_level, NULL,
```
[8.5150]
[10.14797]
```
      mons_standard_rare, mons_standard_level,
```

Replacement in crawl-ref/source/branch.cc at line 31 [10.14355]

B:BD[8.5193] → [8.5193:5247]

      mons_standard_rare, mons_standard_level, NULL,

[8.5193]

[10.15066]

      mons_standard_rare, mons_standard_level,

Replacement in crawl-ref/source/branch.cc at line 39 [10.14355]
∅:D[8.5281] → [10.15280:15331]
B:BD[10.15280] → [10.15280:15331]
```
      mons_mineorc_rare, mons_mineorc_level, NULL,
```
[8.5281]
[10.15331]
```
      mons_mineorc_rare, mons_mineorc_level,
```
Replacement in crawl-ref/source/branch.cc at line 47 [10.14355]
B:BD[8.5321] → [8.5321:5372]
```
      mons_hallelf_rare, mons_hallelf_level, NULL,
```
[8.5321]
[10.15593]
```
      mons_hallelf_rare, mons_hallelf_level,
```
Replacement in crawl-ref/source/branch.cc at line 55 [10.14355]
B:BD[8.5406] → [8.5406:5451]
```
      mons_lair_rare, mons_lair_level, NULL,
```
[8.5406]
[10.15818]
```
      mons_lair_rare, mons_lair_level,
```
Replacement in crawl-ref/source/branch.cc at line 63 [10.14355]
B:BD[8.5484] → [8.5484:5532]
```
      mons_swamp_rare, mons_swamp_level, NULL, 
```
[8.5484]
[10.16033]
```
      mons_swamp_rare, mons_swamp_level, 
```

Replacement in crawl-ref/source/branch.cc at line 71 [10.14355]

B:BD[8.5572] → [8.5572:5625]

      mons_pitslime_rare, mons_pitslime_level, NULL,

[8.5572]

[10.16286]

      mons_pitslime_rare, mons_pitslime_level,

Replacement in crawl-ref/source/branch.cc at line 79 [10.14355]

B:BD[8.5664] → [8.5664:5717]

      mons_pitsnake_rare, mons_pitsnake_level, NULL,

[8.5664]

[10.16532]

      mons_pitsnake_rare, mons_pitsnake_level,

Replacement in crawl-ref/source/branch.cc at line 87 [10.14355]
B:BD[8.5753] → [8.5753:5799]
```
      mons_hive_rare, mons_hive_level, NULL, 
```
[8.5753]
[10.16800]
```
      mons_hive_rare, mons_hive_level, 
```

Replacement in crawl-ref/source/branch.cc at line 95 [10.14355]

B:BD[8.5836] → [8.5836:5889]

      mons_standard_rare, mons_standard_level, NULL,

[8.5836]

[10.17038]

      mons_standard_rare, mons_standard_level,

Replacement in crawl-ref/source/branch.cc at line 104 [10.14355]

B:BD[8.5931] → [8.5931:5987]

      mons_hallblade_rare, mons_hallblade_level, NULL,

[8.5931]

[10.17317]

      mons_hallblade_rare, mons_hallblade_level,

Replacement in crawl-ref/source/branch.cc at line 112 [10.14355]
B:BD[8.6029] → [8.6029:6076]
```
      mons_crypt_rare, mons_crypt_level, NULL,
```
[8.6029]
[10.17541]
```
      mons_crypt_rare, mons_crypt_level,
```
Replacement in crawl-ref/source/branch.cc at line 120 [10.14355]
B:BD[8.6115] → [8.6115:6161]
```
      mons_tomb_rare, mons_tomb_level, NULL, 
```
[8.6115]
[10.17770]
```
      mons_tomb_rare, mons_tomb_level, 
```
Replacement in crawl-ref/source/branch.cc at line 128 [10.14355]
∅:D[8.6203] → [10.17983:18036]
B:BD[10.17983] → [10.17983:18036]
```
      mons_standard_rare, mons_standard_level, NULL,
```
[8.6203]
[10.18036]
```
      mons_standard_rare, mons_standard_level,
```
Replacement in crawl-ref/source/branch.cc at line 137 [10.14355]
∅:D[8.6236] → [10.18230:18273]
B:BD[10.18230] → [10.18230:18273]
```
      mons_dis_rare, mons_dis_level, NULL,
```
[8.6236]
[10.18273]
```
      mons_dis_rare, mons_dis_level,
```
Replacement in crawl-ref/source/branch.cc at line 146 [10.14355]
∅:D[8.6272] → [10.18469:18520]
B:BD[10.18469] → [10.18469:18520]
```
      mons_gehenna_rare, mons_gehenna_level, NULL,
```
[8.6272]
[10.18520]
```
      mons_gehenna_rare, mons_gehenna_level,
```
Replacement in crawl-ref/source/branch.cc at line 155 [10.14355]
∅:D[8.6315] → [10.18723:18774]
B:BD[10.18723] → [10.18723:18774]
```
      mons_cocytus_rare, mons_cocytus_level, NULL,
```
[8.6315]
[10.18774]
```
      mons_cocytus_rare, mons_cocytus_level,
```
Replacement in crawl-ref/source/branch.cc at line 164 [10.14355]
∅:D[8.6356] → [10.18979:19032]
B:BD[10.18979] → [10.18979:19032]
```
      mons_tartarus_rare, mons_tartarus_level, NULL,
```
[8.6356]
[10.19032]
```
      mons_tartarus_rare, mons_tartarus_level,
```
Replacement in crawl-ref/source/branch.cc at line 173 [10.14355]
∅:D[8.6391] → [10.19194:19218]
B:BD[10.19194] → [10.19194:19218]
```
      NULL, NULL, NULL,
```
[8.6391]
[10.19218]
```
      NULL, NULL,
```
Replacement in crawl-ref/source/branch.cc at line 182 [10.14355]
∅:D[8.6426] → [10.19380:19404]
B:BD[10.19380] → [10.19380:19404]
```
      NULL, NULL, NULL,
```
[8.6426]
[10.19404]
```
      NULL, NULL,
```
Replacement in crawl-ref/source/branch.cc at line 191 [10.14355]
B:BD[8.6460] → [8.6460:6511]
```
      mons_hallzot_rare, mons_hallzot_level, NULL,
```
[8.6460]
[10.19640]
```
      mons_hallzot_rare, mons_hallzot_level,
```
Replacement in crawl-ref/source/branch.cc at line 199 [10.14355]
∅:D[8.6546] → [10.19798:19822]
B:BD[10.19798] → [10.19798:19822]
```
      NULL, NULL, NULL,
```
[8.6546]
[10.19822]
```
      NULL, NULL,
```

Removed pointless *level_builder_function from branches[].

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 139 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 169 [6.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 418 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 563 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 568 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 598 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 627 [6.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 628 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2736 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4785 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4792 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4807 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4830 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4850 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7285 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7287 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7346 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7357 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7379 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7588 [6.3429798]

Deletion in crawl-ref/source/branch.h at line 34 [10.13240]

Replacement in crawl-ref/source/branch.cc at line 22 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 31 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 39 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 47 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 55 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 63 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 71 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 79 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 87 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 95 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 104 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 112 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 120 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 128 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 137 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 146 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 155 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 164 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 173 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 182 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 191 [10.14355]

Replacement in crawl-ref/source/branch.cc at line 199 [10.14355]