fiddlerwoaroof/crawl - Change SHFSQYLN7WPQC35V3XYYEIZ4CQMREASUNR474CIKFG3C2FYI4SHQC

General code improvements.

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

Created by haranp on October 11, 2008

SHFSQYLN7WPQC35V3XYYEIZ4CQMREASUNR474CIKFG3C2FYI4SHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 931 [5.16817]
B:BD[4.334] → [4.334:397]
```
    if (!mons_is_safe( static_cast<const monsters*>(monster) )
```
[4.334]
[4.397]
```
    if (!mons_is_safe(monster)
```

Replacement in crawl-ref/source/traps.cc at line 151 [7.5308]

B:BD[6.2929] → [6.2929:2998]

        const monsters* monster = static_cast<const monsters*>(act);

[6.2929]

[6.2998]

        const monsters* monster = dynamic_cast<const monsters*>(act);

Replacement in crawl-ref/source/traps.cc at line 235 [7.5308]

B:BD[7.7763] → [7.7763:7852]

            mprf("The net passes right through %s!", mon->name(DESC_NOCAP_THE).c_str());

[7.7763]

[7.7852]

            mprf("The net passes right through %s!",
                 mon->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/traps.cc at line 240 [7.5308]

B:BD[7.7875] → [7.7875:7937]

B:BD[7.7937] → [8.133:185]

∅:D[8.185] → [9.201:269]

B:BD[9.201] → [9.201:269]

    const monsters* mons = static_cast<const monsters*>(mon);
    bool mon_flies = mons->flight_mode() == FL_FLY;
    if (mon_flies && (!mons_is_confused(mons) || one_chance_in(3)))

[7.7875]

[7.8019]

    bool mon_flies = mon->flight_mode() == FL_FLY;
    if (mon_flies && (!mons_is_confused(mon) || one_chance_in(3)))

Replacement in crawl-ref/source/traps.cc at line 247 [7.5308]

B:BD[7.8119] → [7.8119:8189]

    if (mons->type == MONS_OOZE || mons->type == MONS_PULSATING_LUMP)

[7.8119]

[7.8189]

    if (mon->type == MONS_OOZE || mon->type == MONS_PULSATING_LUMP)

Replacement in crawl-ref/source/traps.cc at line 359 [7.5308]

B:BD[6.4208] → [6.4208:4256]

        m = static_cast<monsters*>(&triggerer);

[6.4208]

[7.9777]

        m = dynamic_cast<monsters*>(&triggerer);

Replacement in crawl-ref/source/traps.cc at line 1180 [7.5308]
B:BD[6.19974] → [6.19974:20013]
∅:D[6.20013] → [7.22581:22582]
B:BD[7.22581] → [7.22581:22582]
B:BD[7.22582] → [6.20014:20077]
```
            // XXX reveal the trap XXX
            monsters* monster = static_cast<monsters *>(&act);
```
[6.19974]
[6.20077]
```
            monsters* monster = dynamic_cast<monsters *>(&act);
```

Replacement in crawl-ref/source/spells1.cc at line 762 [5.616635]

B:BD[5.627120] → [10.539:655]

B:BD[10.655] → [11.2334:2344]

        {
            const monsters *mons = static_cast<const monsters*>(monster);
            print_wounds(mons);
        }

[5.627120]

[12.179]

            print_wounds(monster);

Replacement in crawl-ref/source/religion.cc at line 4855 [5.804403]

B:BD[13.373] → [13.373:429]

B:BD[13.429] → [14.3092:3160]

            did_god_conduct(DID_ATTACK_FRIEND, 8, true,
                            static_cast<const monsters *>(&dummy));

[13.373]

[15.1577]

            did_god_conduct(DID_ATTACK_FRIEND, 8, true, &dummy);

Replacement in crawl-ref/source/player.cc at line 6044 [5.962854]

B:BD[16.4067] → [16.4067:4215]

         if (one_chance_in(20)
             && randart_wpn_property(*item,
                  static_cast<randart_prop_type>(RAP_ANGRY)))
         {

[16.4067]

[16.4215]

         if (randart_wpn_property(*item, RAP_ANGRY) && one_chance_in(20))

Deletion in crawl-ref/source/player.cc at line 6046 [5.962854]
B:BD[16.4243] → [16.4243:4254]
```
         }
```

Replacement in crawl-ref/source/mon-util.cc at line 5656 [5.1699344]

B:BD[2.2607] → [2.2607:2742]

                     mons_pronoun(static_cast<monster_type>(this->type),
                                  PRONOUN_NOCAP_POSSESSIVE));

[2.2607]

[17.3368]

                     this->pronoun(PRONOUN_NOCAP_POSSESSIVE, true).c_str());

Replacement in crawl-ref/source/mon-util.cc at line 5706 [5.1699344]
B:BD[18.8687] → [18.8687:8731]
```
            patrol_point = coord_def(0, 0);
```
[18.8687]
[18.8731]
```
            patrol_point.reset();
```

Replacement in crawl-ref/source/mon-util.cc at line 5776 [5.1699344]

B:BD[19.574] → [20.417:541]

            if (!mons_is_safe( static_cast<const monsters*>(this))
                && is_run_delay(current_delay_action()))

[19.574]

[19.607]

            if (!mons_is_safe(this) && is_run_delay(current_delay_action()))

Replacement in crawl-ref/source/item_use.cc at line 1053 [5.2781507]

B:BD[21.2564] → [21.2564:2605]

    if (!is_valid_item( you.inv[item] ))

[21.2564]

[21.2605]

    const item_def &invitem = you.inv[item];
    if (!is_valid_item(invitem))

Replacement in crawl-ref/source/item_use.cc at line 1062 [5.2781507]
B:BD[21.2714] → [21.2714:2770]
```
    if (!can_wear_armour(you.inv[item], !quiet, false))
```
[21.2714]
[21.2770]
```
    if (!can_wear_armour(invitem, !quiet, false))
```
Deletion in crawl-ref/source/item_use.cc at line 1065 [5.2781507]
B:BD[22.4553] → [23.7371:7418]
```
    const item_def &invitem   = you.inv[item];
```

Replacement in crawl-ref/source/item_use.cc at line 1081 [5.2781507]

B:BD[21.3298] → [21.3298:3334]

B:BD[21.3334] → [3.6971:7037]

        && is_shield(you.inv[item])
        && is_shield_incompatible(*you.weapon(), &you.inv[item]))

[21.3298]

[21.3457]

        && is_shield(invitem)
        && is_shield_incompatible(*you.weapon(), &invitem))

Insertion in crawl-ref/source/item_use.cc at line 1093 [5.2781507]
[5.2802940]
[24.736783]
```
    // Removing body armour requires removing the cloak first.
```
Deletion in crawl-ref/source/item_use.cc at line 1123 [5.2781507]
B:BD[5.2803518] → [5.2803518:2803525]
B:BD[5.2803525] → [24.736941:736996]
∅:D[24.736996] → [5.2803599:2803683]
B:BD[5.2803599] → [5.2803599:2803683]
```
    }
    if (slot == EQ_CLOAK && you.equip[EQ_CLOAK] != -1)
    {
        if (!takeoff_armour(you.equip[EQ_CLOAK]))
            return (false);
```

Replacement in crawl-ref/source/item_use.cc at line 1125 [5.2781507]

B:BD[5.2803690] → [24.736997:737054]

    if (slot == EQ_HELMET && you.equip[EQ_HELMET] != -1)

[5.2803690]

[5.2803766]

    if ((slot == EQ_CLOAK
         || slot == EQ_HELMET
         || slot == EQ_GLOVES
         || slot == EQ_BOOTS
         || slot == EQ_SHIELD
         || slot == EQ_BODY_ARMOUR)
        && you.equip[slot] != -1)

Replacement in crawl-ref/source/item_use.cc at line 1133 [5.2781507]
B:BD[5.2803772] → [5.2803772:2803823]
```
        if (!takeoff_armour(you.equip[EQ_HELMET]))
```
[5.2803772]
[5.2803823]
```
        if (!takeoff_armour(you.equip[slot]))
```

Replacement in crawl-ref/source/item_use.cc at line 1137 [5.2781507]

B:BD[5.2803858] → [24.737055:737112]

∅:D[24.737112] → [5.2803934:2804026]

B:BD[5.2803934] → [5.2803934:2804026]

B:BD[5.2804026] → [24.737113:737168]

∅:D[24.737168] → [5.2804100:2804191]

B:BD[5.2804100] → [5.2804100:2804191]

B:BD[5.2804191] → [24.737169:737226]

∅:D[24.737226] → [5.2804388:2804480]

B:BD[5.2804388] → [5.2804388:2804480]

B:BD[5.2804480] → [24.737227:737294]

∅:D[24.737294] → [5.2804627:2804723]

B:BD[5.2804627] → [5.2804627:2804723]

B:BD[5.2804803] → [5.2804803:2804804]

B:BD[5.2804804] → [25.1182:1237]

    if (slot == EQ_GLOVES && you.equip[EQ_GLOVES] != -1)
    {
        if (!takeoff_armour(you.equip[EQ_GLOVES]))
            return (false);
    }
    if (slot == EQ_BOOTS && you.equip[EQ_BOOTS] != -1)
    {
        if (!takeoff_armour(you.equip[EQ_BOOTS]))
            return (false);
    }
    if (slot == EQ_SHIELD && you.equip[EQ_SHIELD] != -1)
    {
        if (!takeoff_armour(you.equip[EQ_SHIELD]))
            return (false);
    }
    if (slot == EQ_BODY_ARMOUR && you.equip[EQ_BODY_ARMOUR] != -1)
    {
        if (!takeoff_armour(you.equip[EQ_BODY_ARMOUR]))
            return (false);
    }
    if (!safe_to_remove_or_wear(you.inv[item], false))

[5.2803858]

[25.1237]

    if (!safe_to_remove_or_wear(invitem, false))

Replacement in crawl-ref/source/item_use.cc at line 1142 [5.2781507]
B:BD[5.2804843] → [24.737325:737378]
```
    int delay = armour_equip_delay( you.inv[item] );
```
[5.2804843]
[5.2804843]
```
    const int delay = armour_equip_delay(invitem);
```

Replacement in crawl-ref/source/item_use.cc at line 1154 [5.2781507]

B:BD[5.2805093] → [5.2805093:2805140]

    if (you.inv[item].base_type != OBJ_ARMOUR)

[5.2805093]

[5.2805140]

    const item_def& invitem = you.inv[item];
    if (invitem.base_type != OBJ_ARMOUR)

Replacement in crawl-ref/source/item_use.cc at line 1168 [5.2781507]
B:BD[5.2805216] → [5.2805216:2805254]
```
    if (item_cursed( you.inv[item] ))
```
[5.2805216]
[5.2805254]
```
    if (item_cursed( invitem ))
```

Replacement in crawl-ref/source/item_use.cc at line 1170 [5.2781507]

B:BD[5.2805260] → [5.2805260:2805329]

        for (int loopy = EQ_CLOAK; loopy <= EQ_BODY_ARMOUR; loopy++)

[5.2805260]

[5.2805329]

        for (int i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++)

Replacement in crawl-ref/source/item_use.cc at line 1172 [5.2781507]
B:BD[5.2805339] → [5.2805339:2805381]
```
            if (item == you.equip[loopy])
```
[5.2805339]
[5.2805381]
```
            if (item == you.equip[i])
```

Replacement in crawl-ref/source/item_use.cc at line 1175 [5.2781507]

B:BD[26.21847] → [26.21847:21912]

                     you.inv[item].name(DESC_CAP_YOUR).c_str());

[26.21847]

[27.32844]

                     invitem.name(DESC_CAP_YOUR).c_str());

Replacement in crawl-ref/source/item_use.cc at line 1181 [5.2781507]
B:BD[5.2805592] → [25.1263:1317]
```
    if (!safe_to_remove_or_wear(you.inv[item], true))
```
[5.2805592]
[25.1317]
```
    if (!safe_to_remove_or_wear(invitem, true))
```

Replacement in crawl-ref/source/item_use.cc at line 1186 [5.2781507]

B:BD[5.2805643] → [24.737379:737443]

    const equipment_type slot = get_armour_slot(you.inv[item]);

[5.2805643]

    const equipment_type slot = get_armour_slot(invitem);

Deletion in crawl-ref/source/item_use.cc at line 1218 [5.2781507]
∅:D[24.737587] → [5.2806591:2806700]
B:BD[5.2806591] → [5.2806591:2806700]
B:BD[5.2806700] → [27.32939:32971]
∅:D[27.32971] → [5.2806730:2806764]
B:BD[5.2806730] → [5.2806730:2806764]
```
            if (item != you.equip[EQ_SHIELD])
            {
                mpr("You aren't wearing that!");
                return (false);
            }
            break;
```
Deletion in crawl-ref/source/item_use.cc at line 1219 [5.2781507]
∅:D[24.737611] → [5.2806788:2806896]
B:BD[5.2806788] → [5.2806788:2806896]
B:BD[5.2806896] → [27.32972:33004]
∅:D[27.33004] → [5.2806926:2806960]
B:BD[5.2806926] → [5.2806926:2806960]
```
            if (item != you.equip[EQ_CLOAK])
            {
                mpr("You aren't wearing that!");
                return (false);
            }
            break;
```
Deletion in crawl-ref/source/item_use.cc at line 1220 [5.2781507]
∅:D[24.737636] → [5.2806985:2807094]
B:BD[5.2806985] → [5.2806985:2807094]
B:BD[5.2807094] → [27.33005:33037]
∅:D[27.33037] → [5.2807124:2807158]
B:BD[5.2807124] → [5.2807124:2807158]
```
            if (item != you.equip[EQ_HELMET])
            {
                mpr("You aren't wearing that!");
                return (false);
            }
            break;
```
Deletion in crawl-ref/source/item_use.cc at line 1221 [5.2781507]
∅:D[24.737661] → [5.2807184:2807293]
B:BD[5.2807184] → [5.2807184:2807293]
B:BD[5.2807293] → [27.33038:33070]
∅:D[27.33070] → [5.2807323:2807357]
B:BD[5.2807323] → [5.2807323:2807357]
```
            if (item != you.equip[EQ_GLOVES])
            {
                mpr("You aren't wearing that!");
                return (false);
            }
            break;
```
Replacement in crawl-ref/source/item_use.cc at line 1222 [5.2781507]
∅:D[24.737685] → [5.2807381:2807426]
B:BD[5.2807381] → [5.2807381:2807426]
```
            if (item != you.equip[EQ_BOOTS])
```
[24.737685]
[5.2807426]
```
            if (item != you.equip[slot])
```
Replacement in crawl-ref/source/item_use.cc at line 1236 [5.2781507]
B:BD[5.2807596] → [24.737754:737807]
```
    int delay = armour_equip_delay( you.inv[item] );
```
[5.2807596]
[5.2807688]
```
    const int delay = armour_equip_delay(invitem);
```
Replacement in crawl-ref/source/item_use.cc at line 1243 [5.2781507]
∅:D[27.33123] → [5.2807829:2807885]
B:BD[5.2807829] → [5.2807829:2807885]
```
}                               // end takeoff_armour()
```
[27.33123]
[28.3292]
```
}
```
Replacement in crawl-ref/source/item_use.cc at line 4893 [5.2781507]
B:BD[29.5850062] → [30.10167:10204]
∅:D[31.4365] → [32.6052:6070]
∅:D[30.10204] → [32.6052:6070]
B:BD[32.6052] → [32.6052:6070]
```
    const int type = item.base_type;
    switch (type)
```
[29.5850062]
[29.5850098]
```
    switch (item.base_type)
```
Replacement in crawl-ref/source/item_use.cc at line 4906 [5.2781507]
∅:D[31.4466] → [30.10272:10333]
B:BD[33.6263] → [30.10272:10333]
```
            if (type == OBJ_MISCELLANY || item_is_rod(item))
```
[31.4466]
[29.5850647]
```
            if (item.base_type == OBJ_MISCELLANY || item_is_rod(item))
```
Replacement in crawl-ref/source/fight.cc at line 196 [5.3140790]
B:BD[5.3145792] → [24.879965:880001]
```
    if (you.equip[EQ_SHIELD] != -1)
```
[5.3145792]
[5.3145816]
```
    if (you.shield())
```
Replacement in crawl-ref/source/fight.cc at line 198 [5.3140790]
B:BD[5.3145822] → [5.3145822:3145878]
```
        switch (you.inv[you.equip[EQ_SHIELD]].sub_type)
```
[5.3145822]
[5.3145878]
```
        switch (you.shield()->sub_type)
```
Replacement in crawl-ref/source/fight.cc at line 4264 [5.3140790]
B:BD[5.3267017] → [5.3267017:3267068]
```
static inline int player_weapon_str_weight( void )
```
[5.3267017]
[5.3267068]
```
static inline int player_weapon_str_weight()
```
Replacement in crawl-ref/source/fight.cc at line 4266 [5.3140790]
B:BD[5.3267070] → [5.3267070:3267117]
```
    const int weapon = you.equip[ EQ_WEAPON ];
```
[5.3267070]
[5.3267117]
```
    const item_def* weapon = you.weapon();
```
Replacement in crawl-ref/source/fight.cc at line 4271 [5.3140790]
B:BD[5.3267296] → [5.3267296:3267318]
```
    if (weapon == -1)
```
[5.3267296]
[5.3267318]
```
    if (!weapon)
```
Deletion in crawl-ref/source/fight.cc at line 4273 [5.3140790]
B:BD[5.3267338] → [5.3267338:3267427]
```
    int ret = weapon_str_weight( you.inv[weapon].base_type, you.inv[weapon].sub_type );
```

Replacement in crawl-ref/source/fight.cc at line 4274 [5.3140790]

B:BD[5.3267428] → [34.6793:6915]

    const bool shield = (you.equip[EQ_SHIELD] != -1);
    const int  hands  = hands_reqd(you.inv[weapon], player_size());

[5.3267428]

[5.3267643]

    int ret = weapon_str_weight(weapon->base_type, weapon->sub_type);

Replacement in crawl-ref/source/fight.cc at line 4276 [5.3140790]
B:BD[5.3267644] → [24.893336:893376]
```
    if (hands == HANDS_HALF && !shield)
```
[5.3267644]
[5.3267702]
```
    if (hands_reqd(*weapon, player_size()) == HANDS_HALF && !you.shield())
```

Replacement in crawl-ref/source/describe.cc at line 2365 [5.3736416]

B:BD[16.4779] → [16.4779:4853]

        const monsters *mon = &mons;
        get_mimic_item( mon, item );

[16.4779]

[16.4853]

        get_mimic_item(&mons, item);

Replacement in crawl-ref/source/describe.cc at line 2373 [5.3736416]
∅:D[35.2828] → [36.3694:3743]
B:BD[37.2684] → [36.3694:3743]
```
    std::string capname = mons.name(DESC_CAP_A);
```
[35.2828]
[35.2829]
```
    const std::string capname = mons.name(DESC_CAP_A);
```
Replacement in crawl-ref/source/describe.cc at line 2390 [5.3736416]
B:BD[38.537] → [39.302:331]
```
    std::string symbol = "";
```
[38.537]
[39.331]
```
    std::string symbol;
```

General code improvements.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 931 [5.16817]

Replacement in crawl-ref/source/traps.cc at line 151 [7.5308]

Replacement in crawl-ref/source/traps.cc at line 235 [7.5308]

Replacement in crawl-ref/source/traps.cc at line 240 [7.5308]

Replacement in crawl-ref/source/traps.cc at line 247 [7.5308]

Replacement in crawl-ref/source/traps.cc at line 359 [7.5308]

Replacement in crawl-ref/source/traps.cc at line 1180 [7.5308]

Replacement in crawl-ref/source/spells1.cc at line 762 [5.616635]

Replacement in crawl-ref/source/religion.cc at line 4855 [5.804403]

Replacement in crawl-ref/source/player.cc at line 6044 [5.962854]

Deletion in crawl-ref/source/player.cc at line 6046 [5.962854]

Replacement in crawl-ref/source/mon-util.cc at line 5656 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5706 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5776 [5.1699344]

Replacement in crawl-ref/source/item_use.cc at line 1053 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1062 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1065 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1081 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1093 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1123 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1125 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1133 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1137 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1142 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1154 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1168 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1170 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1172 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1175 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1181 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1186 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1218 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1219 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1220 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1221 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1222 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1236 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1243 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4893 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4906 [5.2781507]

Replacement in crawl-ref/source/fight.cc at line 196 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 198 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 4264 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 4266 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 4271 [5.3140790]

Deletion in crawl-ref/source/fight.cc at line 4273 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 4274 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 4276 [5.3140790]

Replacement in crawl-ref/source/describe.cc at line 2365 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2373 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2390 [5.3736416]