fiddlerwoaroof/crawl - Change 4LNIHTHZTCOEZEHZ4GW6WCZH4UCDWKK5UVUKEDODEBBS4YH2KONQC

For (some) consistency, make monster::foe an unsigned short, since that

matches player::pet_target, and because tags.cc seems to save monster::foe as a short anyway.

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

Created by dolorous on June 3, 2008

4LNIHTHZTCOEZEHZ4GW6WCZH4UCDWKK5UVUKEDODEBBS4YH2KONQC

Dependencies

In channels

main

Change contents

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

B:BD[4.116] → [3.4:42]

        int hitting = you.pet_target;

[4.116]

[4.154]

        unsigned short hitting = you.pet_target;

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

B:BD[4.424] → [3.43:81]

        int hitting = you.pet_target;

[4.424]

[4.462]

        unsigned short hitting = you.pet_target;

Replacement in crawl-ref/source/view.h at line 79 [6.13254]

B:BD[6.13943] → [7.4:73]

bool mons_near(const monsters *monster, unsigned int foe = MHITYOU);

[6.13943]

[8.7]

bool mons_near(const monsters *monster, unsigned short foe = MHITYOU);

Replacement in crawl-ref/source/view.cc at line 3615 [6.16817]

B:BD[6.88358] → [7.75:133]

bool mons_near(const monsters *monster, unsigned int foe)

[6.88358]

[6.88417]

bool mons_near(const monsters *monster, unsigned short foe)

Replacement in crawl-ref/source/spells4.cc at line 485 [6.436250]

B:BD[6.453710] → [9.261:409]

B:BD[9.409] → [3.243:317]

    const beh_type beha = item_cursed( you.inv[ weapon ] ) ? BEH_HOSTILE
                                                           : BEH_FRIENDLY;
    const int hitting = (beha == BEH_HOSTILE) ? MHITYOU : you.pet_target;

[6.453710]

[6.453838]

    const beh_type beha = item_cursed(you.inv[ weapon ]) ? BEH_HOSTILE
                                                         : BEH_FRIENDLY;
    const unsigned short hitting = (beha == BEH_HOSTILE) ? MHITYOU
                                                         : you.pet_target;

Replacement in crawl-ref/source/spells3.cc at line 480 [6.531613]
B:BD[9.629] → [3.320:354]
```
    int hitting = you.pet_target;
```
[9.629]
[6.543743]
```
    unsigned short hitting = you.pet_target;
```
Replacement in crawl-ref/source/spells2.cc at line 1542 [6.569242]
B:BD[10.702] → [3.357:391]
```
    int hitting = you.pet_target;
```
[10.702]
[6.605268]
```
    unsigned short hitting = you.pet_target;
```
Replacement in crawl-ref/source/monstuff.cc at line 2466 [6.1396662]
B:BD[2.5632] → [2.5632:5679]
∅:D[11.3113] → [6.1443545:1443586]
∅:D[2.5679] → [6.1443545:1443586]
B:BD[6.1443545] → [6.1443545:1443586]
```
        beh_type new_beh     = mon->behaviour;
        unsigned int new_foe = mon->foe;
```
[2.5632]
[6.1443586]
```
        beh_type new_beh       = mon->behaviour;
        unsigned short new_foe = mon->foe;
```
Replacement in crawl-ref/source/monplace.h at line 108 [6.1638277]
B:BD[12.17620] → [12.17620:17642]
```
    monster_type cls;
```
[12.17620]
[12.17642]
```
    monster_type    cls;
```
Replacement in crawl-ref/source/monplace.h at line 113 [6.1638277]
B:BD[12.17828] → [12.17828:17856]
```
    monster_type base_type;
```
[12.17828]
[12.17856]
```
    monster_type    base_type;
```
Replacement in crawl-ref/source/monplace.h at line 119 [6.1638277]
B:BD[12.18118] → [12.18118:18146]
```
    beh_type     behaviour;
```
[12.18118]
[12.18146]
```
    beh_type        behaviour;
```
Replacement in crawl-ref/source/monplace.h at line 124 [6.1638277]
B:BD[12.18327] → [12.18327:18365]
```
    int          abjuration_duration;
```
[12.18327]
[12.18365]
```
    int             abjuration_duration;
```
Replacement in crawl-ref/source/monplace.h at line 127 [6.1638277]
B:BD[12.18408] → [12.18408:18430]
```
    coord_def    pos;
```
[12.18408]
[12.18430]
```
    coord_def       pos;
```
Replacement in crawl-ref/source/monplace.h at line 134 [6.1638277]
B:BD[12.18755] → [12.18755:18777]
```
    int          foe;
```
[12.18755]
[12.18777]
```
    unsigned short  foe;
```
Replacement in crawl-ref/source/monplace.h at line 137 [6.1638277]
B:BD[12.18823] → [12.18823:18847]
```
    unsigned     flags;
```
[12.18823]
[12.18847]
```
    unsigned        flags;
```
Replacement in crawl-ref/source/monplace.h at line 141 [6.1638277]
B:BD[12.18993] → [12.18993:19018]
```
    int          number;
```
[12.18993]
[12.19018]
```
    int             number;
```
Replacement in crawl-ref/source/monplace.h at line 144 [6.1638277]
B:BD[12.19052] → [12.19052:19077]
```
    int          colour;
```
[12.19052]
[12.19077]
```
    int             colour;
```
Replacement in crawl-ref/source/monplace.h at line 149 [6.1638277]
B:BD[12.19260] → [12.19260:19284]
```
    int          power;
```
[12.19260]
[12.19284]
```
    int             power;
```
Replacement in crawl-ref/source/monplace.h at line 153 [6.1638277]
B:BD[12.19435] → [12.19435:19465]
```
    proximity_type proximity;
```
[12.19435]
[12.19465]
```
    proximity_type  proximity;
```
Replacement in crawl-ref/source/monplace.h at line 172 [6.1638277]
B:BD[12.20330] → [12.20330:20364]
```
              int mfoe = MHITNOT,
```
[12.20330]
[12.20364]
```
              unsigned short mfoe = MHITNOT,
```
Replacement in crawl-ref/source/it_use3.cc at line 691 [6.2870456]
B:BD[13.3002] → [3.2862:2889]
```
    int hitting = MHITYOU;
```
[13.3002]
[13.3029]
```
    unsigned short hitting = MHITYOU;
```
Replacement in crawl-ref/source/externs.h at line 1031 [6.3270163]
∅:D[11.4249] → [6.3280809:3280831]
B:BD[6.3280809] → [6.3280809:3280831]
```
    unsigned int foe;
```
[11.4249]
[14.8628]
```
    unsigned short foe;
```

For (some) consistency, make monster::foe an unsigned short, since that

Dependencies

In channels

Change contents

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

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

Replacement in crawl-ref/source/view.h at line 79 [6.13254]

Replacement in crawl-ref/source/view.cc at line 3615 [6.16817]

Replacement in crawl-ref/source/spells4.cc at line 485 [6.436250]

Replacement in crawl-ref/source/spells3.cc at line 480 [6.531613]

Replacement in crawl-ref/source/spells2.cc at line 1542 [6.569242]

Replacement in crawl-ref/source/monstuff.cc at line 2466 [6.1396662]

Replacement in crawl-ref/source/monplace.h at line 108 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 113 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 119 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 124 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 127 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 134 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 137 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 141 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 144 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 149 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 153 [6.1638277]

Replacement in crawl-ref/source/monplace.h at line 172 [6.1638277]

Replacement in crawl-ref/source/it_use3.cc at line 691 [6.2870456]

Replacement in crawl-ref/source/externs.h at line 1031 [6.3270163]