fiddlerwoaroof/crawl - Change ISSEUTHG7EH3QTFLS23GXFIOQXCI5HJPJMK6GWNFMC6NDRD2H34QC

Add miscellaneous type cleanups and comment fixes.

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

Created by dolorous on January 3, 2008

ISSEUTHG7EH3QTFLS23GXFIOQXCI5HJPJMK6GWNFMC6NDRD2H34QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1504 [4.1396662]

B:BD[4.1432296] → [4.1432296:1432367]

    // chose an appropiate habitat square at random around the target.

[4.1432296]

[5.2140]

    // Choose an appropriate habitat square at random around the target.

Replacement in crawl-ref/source/monstuff.cc at line 5460 [4.1396662]
B:BD[6.5397] → [6.5397:5402]
```
    
```
[6.5397]
[4.1529903]
Replacement in crawl-ref/source/monstuff.cc at line 5465 [4.1396662]
B:BD[4.1530232] → [4.1530232:1530265]
```
    if (mons_flies(monster) > 0 
```
[4.1530232]
[4.1530265]
```
    if (mons_flies(monster) != FL_NONE
```
Replacement in crawl-ref/source/monstuff.cc at line 5556 [4.1396662]
B:BD[4.1540117] → [4.1540117:1540163]
```
        && (monster->x + mmov_x != you.x_pos 
```
[4.1540117]
[4.1540163]
```
        && (monster->x + mmov_x != you.x_pos
```

Deletion in crawl-ref/source/monplace.h at line 177 [4.1638277]

B:BD[3.757] → [3.757:867]

∅:D[3.867] → [7.194:263]

B:BD[8.450685] → [7.194:263]

bool monster_habitable_grid(int monster_class,
                            dungeon_feature_type actual_grid, 
                            int flies = -1, bool paralysed = false);

Insertion in crawl-ref/source/monplace.h at line 179 [4.1638277]

[3.978]

[8.450844]

bool monster_habitable_grid(int monster_class,
                            dungeon_feature_type actual_grid,
                            int flies = -1,
                            bool paralysed = false);

Replacement in crawl-ref/source/monplace.cc at line 77 [4.1641732]

B:BD[8.451884] → [3.1108:1189]

bool monster_habitable_grid(const monsters *m, dungeon_feature_type actual_grid)

[8.451884]

[8.451948]

bool monster_habitable_grid(const monsters *m,
                            dungeon_feature_type actual_grid)

Replacement in crawl-ref/source/monplace.cc at line 88 [4.1641732]

B:BD[7.398] → [7.398:447]

    return (paralysed? flies == 2 : flies != 0);

[7.398]

[7.447]

    return (paralysed ? flies == FL_LEVITATE : flies != FL_NONE);

Replacement in crawl-ref/source/monplace.cc at line 96 [4.1641732]

B:BD[8.452308] → [8.452308:452383]

// on dry land, because they're supposed to be able to move onto dry land

[8.452308]

[8.452383]

// on dry land, because they're supposed to be able to move onto dry land

Replacement in crawl-ref/source/monplace.cc at line 110 [4.1641732]
∅:D[9.589] → [8.452832:452878]
∅:D[7.590] → [8.452832:452878]
B:BD[8.452832] → [8.452832:452878]
```
                && (actual_grid == DNGN_LAVA 
```
[7.590]
[8.452878]
```
                && (actual_grid == DNGN_LAVA
```
Replacement in crawl-ref/source/mon-util.h at line 157 [4.1682293]
B:BD[10.69556] → [10.69556:69584]
```
    MONUSE_WEAPONS_ARMOUR, 
```
[10.69556]
[10.69584]
```
    MONUSE_WEAPONS_ARMOUR,
```
Replacement in crawl-ref/source/mon-util.h at line 226 [4.1682293]
B:BD[10.71545] → [10.71545:71561]
```
    Z_NOZOMBIE,
```
[10.71545]
[10.71561]
```
    Z_NOZOMBIE = 0,
```
Replacement in crawl-ref/source/mon-util.h at line 329 [4.1682293]
∅:D[11.5637] → [12.215:234]
B:BD[4.1688492] → [12.215:234]
```
                  
```
[11.5637]
[4.1688493]

Replacement in crawl-ref/source/mon-util.h at line 334 [4.1682293]

B:BD[4.1688754] → [13.2037:2124]

flight_type mons_class_flies( int mc );
flight_type mons_flies( const monsters *mon );

[4.1688754]

[4.1688828]

flight_type mons_class_flies(int mc);
flight_type mons_flies(const monsters *mon);

Replacement in crawl-ref/source/mon-util.h at line 431 [4.1682293]
B:BD[4.1692638] → [14.10561:10600]
```
mon_intel_type mons_intel(int mclass);
```
[4.1692638]
[2.2613]
```
mon_intel_type mons_intel(int mc);
```
Replacement in crawl-ref/source/mon-util.h at line 472 [4.1682293]
B:BD[4.1694071] → [4.1694071:1694100]
```
int mons_skeleton(int mcls);
```
[4.1694071]
[4.1694100]
```
bool mons_skeleton(int mc);
```
Replacement in crawl-ref/source/mon-util.h at line 494 [4.1682293]
B:BD[4.1694912] → [4.1694912:1694946]
```
int mons_zombie_size(int mclass);
```
[4.1694912]
[4.1694946]
```
int mons_zombie_size(int mc);
```

Replacement in crawl-ref/source/mon-util.cc at line 637 [4.1699344]

B:BD[15.4560] → [16.1149:1225]

    else if (((get_monster_data(mon->type))->bitfields & M_SEE_INVIS) != 0)

[15.4560]

[17.641]

    else if (mons_class_flag(mon->type, M_SEE_INVIS))

Replacement in crawl-ref/source/mon-util.cc at line 1110 [4.1699344]
B:BD[4.1715933] → [4.1715933:1715959]
```
int mons_skeleton(int mc)
```
[4.1715933]
[4.1715959]
```
bool mons_skeleton(int mc)
```

Replacement in crawl-ref/source/mon-util.cc at line 1112 [4.1699344]

B:BD[4.1715961] → [4.1715961:1716071]

    if (mons_zombie_size(mc) == 0
        || mons_weight(mc) == 0 || ((smc->bitfields & M_NO_SKELETON) != 0))

[4.1715961]

[4.1716071]

    if (mons_zombie_size(mc) == Z_NOZOMBIE
        || mons_weight(mc) == 0 || (mons_class_flag(mc, M_NO_SKELETON)))

Replacement in crawl-ref/source/mon-util.cc at line 1115 [4.1699344]
B:BD[4.1716077] → [4.1716077:1716097]
```
        return (0);
```
[4.1716077]
[4.1716097]
```
        return false;
```
Replacement in crawl-ref/source/mon-util.cc at line 1118 [4.1699344]
B:BD[4.1716104] → [4.1716104:1716120]
```
    return (1);
```
[4.1716104]
[4.1716120]
```
    return true;
```
Replacement in crawl-ref/source/mon-util.cc at line 1123 [4.1699344]
B:BD[4.1716300] → [4.1716300:1716350]
```
    int f = smc->bitfields;
    if (f & M_FLIES)
```
[4.1716208]
[13.2164]
```
    if (mons_class_flag(mc, M_FLIES))
```
Replacement in crawl-ref/source/mon-util.cc at line 1126 [4.1699344]
B:BD[4.1716371] → [4.1716371:1716395]
```
    if (f & M_LEVITATE)
```
[4.1716371]
[13.2190]
```
    if (mons_class_flag(mc, M_LEVITATE))
```
Replacement in crawl-ref/source/mon-util.cc at line 1132 [4.1699344]
B:BD[4.1716435] → [13.2244:2290]
```
flight_type mons_flies( const monsters *mon )
```
[4.1716435]
[4.1716475]
```
flight_type mons_flies(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1139 [4.1699344]
B:BD[15.4931] → [15.4931:4936]
```
    
```
[15.4931]
[13.2317]
Deletion in crawl-ref/source/mon-util.cc at line 1145 [4.1699344]
B:BD[4.1716657] → [4.1716657:1716658]

Replacement in crawl-ref/source/mon-util.cc at line 1160 [4.1699344]

B:BD[4.1716999] → [4.1716999:1717068]

// This function returns the standard number of hit dice for a type

[4.1716999]

[4.1717068]

// This function returns the standard number of hit dice for a type

Replacement in crawl-ref/source/mon-data.h at line 106 [4.1826214]
B:BD[4.1829493] → [4.1829493:1829543]
```
// it is also a good prototype for new monstersst
```
[4.1829493]
[4.1829543]
```
// it is also a good prototype for new monsters
```

Replacement in crawl-ref/source/mon-data.h at line 1646 [4.1826214]

B:BD[4.1869332] → [4.1869332:1869428]

// these are named more explicitly when they attack, also when you use 'x'
//  to examine them.

[4.1869332]

[4.1869428]

// These are named more explicitly when they attack, also when you use 'x'
// to examine them.

Replacement in crawl-ref/source/dungeon.cc at line 7054 [4.3429798]
B:BD[4.3687313] → [4.3687313:3687342]
```
            zombie_size = 1;
```
[4.3687313]
[4.3687342]
```
            zombie_size = Z_SMALL;
```
Replacement in crawl-ref/source/dungeon.cc at line 7060 [4.3429798]
B:BD[4.3687464] → [4.3687464:3687493]
```
            zombie_size = 2;
```
[4.3687464]
[4.3687493]
```
            zombie_size = Z_BIG;
```

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

B:BD[4.3690036] → [4.3690036:3690110]

            if (mons_zombie_size(cls) != zombie_size && zombie_size >= 0)

[4.3690036]

[4.3690110]

            if (mons_zombie_size(cls) != zombie_size && zombie_size != -1)

Replacement in crawl-ref/source/dungeon.cc at line 7142 [4.3429798]
B:BD[4.3690520] → [4.3690520:3690564]
```
            chance = (ignore_rarity) ? 100 
```
[4.3690520]
[4.3690564]
```
            chance = (ignore_rarity) ? 100
```
Deletion in crawl-ref/source/dungeon.cc at line 7191 [4.3429798]
B:BD[4.3691815] → [4.3691815:3691849]
```
    menv[mid].number = mons_sec2;
```

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

B:BD[4.3691916] → [4.3691916:3691984]

        menv[mid].type = ((mons_zombie_size(menv[mid].number) == 2)

[4.3691916]

[4.3691984]

        menv[mid].type = ((mons_zombie_size(menv[mid].number) == Z_BIG)

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

B:BD[4.3692495] → [4.3692495:3692565]

        menv[mid].type = ((mons_zombie_size( menv[mid].number ) == 2)

[4.3692495]

[4.3692565]

        menv[mid].type = ((mons_zombie_size( menv[mid].number ) == Z_BIG)

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

B:BD[4.3692724] → [4.3692724:3692802]

        // Simulacrum aren't tough, but you can create piles of them. -- bwr

[4.3692724]

[4.3692802]

        // Simulacrum aren't tough, but you can create piles of them. -- bwr

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

B:BD[4.3692930] → [4.3692930:3693000]

        menv[mid].type = ((mons_zombie_size( menv[mid].number ) == 2)

[4.3692930]

[4.3693000]

        menv[mid].type = ((mons_zombie_size( menv[mid].number ) == Z_BIG)

Add miscellaneous type cleanups and comment fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1504 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5460 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5465 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5556 [4.1396662]

Deletion in crawl-ref/source/monplace.h at line 177 [4.1638277]

Insertion in crawl-ref/source/monplace.h at line 179 [4.1638277]

Replacement in crawl-ref/source/monplace.cc at line 77 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 88 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 96 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 110 [4.1641732]

Replacement in crawl-ref/source/mon-util.h at line 157 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 226 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 329 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 334 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 431 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 472 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 494 [4.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 637 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1110 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1112 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1115 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1118 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1123 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1126 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1132 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1139 [4.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 1145 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1160 [4.1699344]

Replacement in crawl-ref/source/mon-data.h at line 106 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1646 [4.1826214]

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

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

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

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

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

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

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

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

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