fiddlerwoaroof/crawl - Change NYURIMPCM2RADLMIQSN76OPKXQSK4XBLFNXD2OO53KGZI3MA6AQAC

Add minor cosmetic fixes.

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

Created by dolorous on June 22, 2008

NYURIMPCM2RADLMIQSN76OPKXQSK4XBLFNXD2OO53KGZI3MA6AQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 205 [5.3]

B:BD[5.4745] → [5.4745:4942]

static void xom_make_item(object_class_type base,
                          int subtype,
                          int power,
                          const char *failmsg = "\"No, never mind.\"")

[5.4745]

[5.4942]

static void _xom_make_item(object_class_type base,
                           int subtype,
                           int power,
                           const char *failmsg = "\"No, never mind.\"")

Replacement in crawl-ref/source/xom.cc at line 229 [5.3]

B:BD[5.5574] → [5.5574:5648]

static object_class_type get_unrelated_wield_class(object_class_type ref)

[5.5574]

[5.5648]

static object_class_type _get_unrelated_wield_class(object_class_type ref)

Replacement in crawl-ref/source/xom.cc at line 257 [5.3]
B:BD[5.6223] → [5.6223:6265]
```
static bool xom_annoyance_gift(int power)
```
[5.6223]
[5.6265]
```
static bool _xom_annoyance_gift(int power)
```

Replacement in crawl-ref/source/xom.cc at line 273 [5.3]

B:BD[5.6723] → [5.6723:6802]

                xom_make_item(weapon->base_type, weapon->sub_type, power * 3);

[5.6723]

[5.6802]

                _xom_make_item(weapon->base_type, weapon->sub_type, power * 3);

Replacement in crawl-ref/source/xom.cc at line 285 [5.3]

∅:D[6.199] → [5.7250:7327]

∅:D[7.541] → [5.7250:7327]

B:BD[5.7250] → [5.7250:7327]

            xom_make_item(OBJ_JEWELLERY, get_random_ring_type(), power * 3);

[7.541]

[5.7327]

            _xom_make_item(OBJ_JEWELLERY, get_random_ring_type(), power * 3);

Replacement in crawl-ref/source/xom.cc at line 295 [5.3]

∅:D[6.263] → [5.7630:7709]

∅:D[7.607] → [5.7630:7709]

B:BD[5.7630] → [5.7630:7709]

            xom_make_item(OBJ_JEWELLERY, get_random_amulet_type(), power * 3);

[7.607]

[5.7709]

            _xom_make_item(OBJ_JEWELLERY, get_random_amulet_type(), power * 3);

Replacement in crawl-ref/source/xom.cc at line 307 [5.3]

∅:D[6.332] → [5.8162:8239]

∅:D[7.671] → [5.8162:8239]

B:BD[5.8162] → [5.8162:8239]

            xom_make_item(OBJ_JEWELLERY, get_random_ring_type(), power * 3);

[7.671]

[5.8239]

            _xom_make_item(OBJ_JEWELLERY, get_random_ring_type(), power * 3);

Replacement in crawl-ref/source/xom.cc at line 318 [5.3]

B:BD[5.8542] → [5.8542:8604]

                get_unrelated_wield_class(weapon->base_type);

[5.8542]

[8.170]

                _get_unrelated_wield_class(weapon->base_type);

Replacement in crawl-ref/source/xom.cc at line 323 [5.3]

B:BD[5.8719] → [5.8719:8782]

                xom_make_item(objtype, OBJ_RANDOM, power * 3);

[5.8719]

[5.8782]

                _xom_make_item(objtype, OBJ_RANDOM, power * 3);

Replacement in crawl-ref/source/xom.cc at line 333 [5.3]
B:BD[5.8881] → [5.8881:8916]
```
    if (xom_annoyance_gift(power))
```
[5.8881]
[5.8916]
```
    if (_xom_annoyance_gift(power))
```

Replacement in crawl-ref/source/xom.cc at line 342 [5.3]

∅:D[2.65] → [5.9199:9413]

∅:D[6.474] → [5.9199:9413]

∅:D[7.803] → [5.9199:9413]

B:BD[5.9199] → [5.9199:9413]

        xom_make_item(OBJ_ARMOUR,
                      random2(10)?
                          get_random_body_armour_type(you.your_level * 2)
                        : ARM_CLOAK,
                      power * 3);

[2.65]

[5.9413]

        _xom_make_item(OBJ_ARMOUR,
                       random2(10) ?
                           get_random_body_armour_type(you.your_level * 2)
                       : ARM_CLOAK,
                       power * 3);

Replacement in crawl-ref/source/xom.cc at line 377 [5.3]
∅:D[9.833] → [5.10323:10381]
B:BD[5.10323] → [5.10323:10381]
```
        xom_make_item(OBJ_RANDOM, OBJ_RANDOM, power * 3);
```
[9.833]
[5.10381]
```
        _xom_make_item(OBJ_RANDOM, OBJ_RANDOM, power * 3);
```

Replacement in crawl-ref/source/xom.cc at line 384 [5.3]

B:BD[5.11302] → [10.5:63]

static bool choose_mutatable_monster(const monsters* mon)

[5.10698]

[5.11340]

static bool _choose_mutatable_monster(const monsters* mon)

Replacement in crawl-ref/source/xom.cc at line 390 [5.3]

B:BD[5.11718] → [11.4:84]

static monster_type xom_random_demon(int sever, bool use_greater_demons = true)

[5.11718]

[6.581]

static monster_type _xom_random_demon(int sever, bool use_greater_demons = true)

Replacement in crawl-ref/source/xom.cc at line 394 [5.3]

B:BD[11.181] → [12.5:77]

    mprf(MSGCH_DIAGNOSTICS, "xom_random_demon(); sever = %d, roll: %d",

[11.181]

[11.251]

    mprf(MSGCH_DIAGNOSTICS, "_xom_random_demon(); sever = %d, roll: %d",

Replacement in crawl-ref/source/xom.cc at line 416 [5.3]
∅:D[13.513] → [11.688:747]
B:BD[11.688] → [11.688:747]
```
static monster_type xom_random_punishment_demon(int sever)
```
[13.513]
[11.747]
```
static monster_type _xom_random_punishment_demon(int sever)
```
Replacement in crawl-ref/source/xom.cc at line 421 [5.3]
B:BD[6.610] → [11.793:834]
```
        demon = xom_random_demon(sever);
```
[6.610]
[11.834]
```
        demon = _xom_random_demon(sever);
```
Replacement in crawl-ref/source/xom.cc at line 430 [5.3]
∅:D[14.70] → [5.11718:11753]
∅:D[6.999] → [5.11718:11753]
∅:D[9.1014] → [5.11718:11753]
B:BD[5.11718] → [5.11718:11753]
```
static bool xom_is_good(int sever)
```
[9.1014]
[5.11753]
```
static bool _xom_is_good(int sever)
```

Replacement in crawl-ref/source/xom.cc at line 481 [5.3]

B:BD[4.171] → [4.171:221]

            monster[i] = xom_random_demon(sever);

[4.171]

[4.221]

            monster[i] = _xom_random_demon(sever);

Replacement in crawl-ref/source/xom.cc at line 561 [5.3]
∅:D[15.215] → [16.2488:2540]
B:BD[16.2488] → [16.2488:2540]
```
        monster_type mon = xom_random_demon(sever);
```
[14.1494]
[17.440]
```
        monster_type mon = _xom_random_demon(sever);
```

Replacement in crawl-ref/source/xom.cc at line 598 [5.3]

B:BD[18.28] → [18.28:99]

            choose_random_nearby_monster(0, choose_mutatable_monster);

[18.28]

[10.320]

            choose_random_nearby_monster(0, _choose_mutatable_monster);

Replacement in crawl-ref/source/xom.cc at line 650 [5.3]
∅:D[15.673] → [19.820:872]
B:BD[19.820] → [19.820:872]
```
        monster_type mon = xom_random_demon(sever);
```
[5.17557]
[17.577]
```
        monster_type mon = _xom_random_demon(sever);
```

Replacement in crawl-ref/source/xom.cc at line 673 [5.3]

∅:D[20.391] → [21.275:344]

∅:D[4.2434] → [21.275:344]

B:BD[22.304] → [21.275:344]

                mgen_data(xom_random_demon(sever, one_chance_in(8)),

[4.2434]

[21.344]

                mgen_data(_xom_random_demon(sever, one_chance_in(8)),

Replacement in crawl-ref/source/xom.cc at line 718 [5.3]
B:BD[5.19550] → [5.19550:19584]
```
static bool xom_is_bad(int sever)
```
[5.19550]
[5.19584]
```
static bool _xom_is_bad(int sever)
```

Replacement in crawl-ref/source/xom.cc at line 790 [5.3]

B:BD[18.146] → [18.146:221]

                choose_random_nearby_monster(0, choose_mutatable_monster);

[18.146]

[10.532]

                choose_random_nearby_monster(0, _choose_mutatable_monster);

Replacement in crawl-ref/source/xom.cc at line 850 [5.3]

∅:D[3.55] → [23.61:129]

B:BD[23.61] → [23.61:129]

                                xom_random_punishment_demon(sever),

[3.55]

[3.56]

                                _xom_random_punishment_demon(sever),

Replacement in crawl-ref/source/xom.cc at line 921 [5.3]
B:BD[5.27509] → [5.27509:27545]
```
        while (!xom_is_good(sever))
```
[5.27509]
[5.27545]
```
        while (!_xom_is_good(sever))
```
Replacement in crawl-ref/source/xom.cc at line 927 [5.3]
B:BD[5.27601] → [5.27601:27636]
```
        while (!xom_is_bad(sever))
```
[5.27601]
[5.27636]
```
        while (!_xom_is_bad(sever))
```
Replacement in crawl-ref/source/xom.cc at line 946 [5.3]
B:BD[24.4506] → [25.143:193]
```
static void xom_check_less_runes(int runes_gones)
```
[24.4506]
[25.193]
```
static void _xom_check_less_runes(int runes_gone)
```
Replacement in crawl-ref/source/xom.cc at line 958 [5.3]
B:BD[25.529] → [25.529:576]
```
    int was_avail = runes_avail + runes_gones;
```
[25.529]
[25.576]
```
    int was_avail = runes_avail + runes_gone;
```

Replacement in crawl-ref/source/xom.cc at line 979 [5.3]

B:BD[25.1025] → [25.1025:1074]

            xom_check_less_runes(item.quantity);

[25.1025]

[25.1074]

            _xom_check_less_runes(item.quantity);

Replacement in crawl-ref/source/xom.cc at line 1021 [5.3]
B:BD[25.1836] → [25.1836:1881]
```
        xom_check_less_runes(item.quantity);
```
[25.1836]
[25.1881]
```
        _xom_check_less_runes(item.quantity);
```

Add minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 205 [5.3]

Replacement in crawl-ref/source/xom.cc at line 229 [5.3]

Replacement in crawl-ref/source/xom.cc at line 257 [5.3]

Replacement in crawl-ref/source/xom.cc at line 273 [5.3]

Replacement in crawl-ref/source/xom.cc at line 285 [5.3]

Replacement in crawl-ref/source/xom.cc at line 295 [5.3]

Replacement in crawl-ref/source/xom.cc at line 307 [5.3]

Replacement in crawl-ref/source/xom.cc at line 318 [5.3]

Replacement in crawl-ref/source/xom.cc at line 323 [5.3]

Replacement in crawl-ref/source/xom.cc at line 333 [5.3]

Replacement in crawl-ref/source/xom.cc at line 342 [5.3]

Replacement in crawl-ref/source/xom.cc at line 377 [5.3]

Replacement in crawl-ref/source/xom.cc at line 384 [5.3]

Replacement in crawl-ref/source/xom.cc at line 390 [5.3]

Replacement in crawl-ref/source/xom.cc at line 394 [5.3]

Replacement in crawl-ref/source/xom.cc at line 416 [5.3]

Replacement in crawl-ref/source/xom.cc at line 421 [5.3]

Replacement in crawl-ref/source/xom.cc at line 430 [5.3]

Replacement in crawl-ref/source/xom.cc at line 481 [5.3]

Replacement in crawl-ref/source/xom.cc at line 561 [5.3]

Replacement in crawl-ref/source/xom.cc at line 598 [5.3]

Replacement in crawl-ref/source/xom.cc at line 650 [5.3]

Replacement in crawl-ref/source/xom.cc at line 673 [5.3]

Replacement in crawl-ref/source/xom.cc at line 718 [5.3]

Replacement in crawl-ref/source/xom.cc at line 790 [5.3]

Replacement in crawl-ref/source/xom.cc at line 850 [5.3]

Replacement in crawl-ref/source/xom.cc at line 921 [5.3]

Replacement in crawl-ref/source/xom.cc at line 927 [5.3]

Replacement in crawl-ref/source/xom.cc at line 946 [5.3]

Replacement in crawl-ref/source/xom.cc at line 958 [5.3]

Replacement in crawl-ref/source/xom.cc at line 979 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1021 [5.3]