fiddlerwoaroof/crawl - Change YOH32TMLN6QJG4ZFLYWPJF3YUEGIMZPVPYN57RTB26QBBHMICV3AC

[1747353] Allies shouldn't be noted as "defeated" by you.

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

Created by haranp on July 3, 2007

YOH32TMLN6QJG4ZFLYWPJF3YUEGIMZPVPYN57RTB26QBBHMICV3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1900 [6.804403]
∅:D[4.1774] → [5.7193:7245]
B:BD[5.7193] → [5.7193:7245]
```
                    god_speaks(you.religion, info);
```
[4.1774]
[4.1775]
```
                god_speaks(you.religion, info);
```

Replacement in crawl-ref/source/notes.cc at line 289 [9.370339]

B:BD[7.12016] → [8.1720:1763]

            result << "Defeated " << name;

[7.12016]

[7.12084]

            if ( second )
                result << name << " (ally) was defeated";
            else
                result << "Defeated " << name;

Replacement in crawl-ref/source/monstuff.h at line 50 [6.1390580]

B:BD[6.1392061] → [10.72:150]

void monster_die(monsters *monster, char killer, int i, bool silent = false);

[6.1392061]

[10.150]

void monster_die(monsters *monster, killer_type killer,
                 int i, bool silent = false);

Replacement in crawl-ref/source/monstuff.h at line 53 [6.1390580]

B:BD[10.151] → [10.151:216]

void mons_check_pool(monsters *monster, int killer = KILL_MISC);

[10.151]

[6.1392125]

void mons_check_pool(monsters *monster, killer_type killer = KILL_MISC);

Replacement in crawl-ref/source/monstuff.cc at line 344 [6.1396662]
∅:D[11.583] → [12.2077:2128]
B:BD[12.2077] → [12.2077:2128]
```
static std::string milestone_kill_verb(int killer)
```
[11.583]
[12.2128]
```
static std::string milestone_kill_verb(killer_type killer)
```

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

B:BD[13.788] → [12.2191:2265]

static void check_kill_milestone(const monsters *mons, int killer, int i)

[13.788]

[12.2265]

static void check_kill_milestone(const monsters *mons,
                                 killer_type killer, int i)

Replacement in crawl-ref/source/monstuff.cc at line 369 [6.1396662]
∅:D[13.788] → [10.218:287]
∅:D[12.2772] → [10.218:287]
B:BD[6.1405585] → [10.218:287]
```
void monster_die(monsters *monster, char killer, int i, bool silent)
```
[12.2772]
[6.1405648]
```
void monster_die(monsters *monster, killer_type killer, int i, bool silent)
```

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

B:BD[14.348] → [14.348:412]

            take_note(Note(NOTE_KILL_MONSTER, monster->type, 0,

[14.348]

[2.1793]

            take_note(Note(NOTE_KILL_MONSTER,
                           monster->type, mons_friendly(monster),

Replacement in crawl-ref/source/monstuff.cc at line 4150 [6.1396662]
B:BD[10.4124] → [10.4124:4173]
```
void mons_check_pool(monsters *mons, int killer)
```
[10.4124]
[10.4173]
```
void mons_check_pool(monsters *mons, killer_type killer)
```
Replacement in crawl-ref/source/mon-util.cc at line 4243 [6.1699344]
B:BD[15.29149] → [15.29149:29181]
```
int mon_enchant::killer() const
```
[15.29149]
[15.29181]
```
killer_type mon_enchant::killer() const
```
Replacement in crawl-ref/source/externs.h at line 463 [6.3270163]
B:BD[16.2372] → [16.2372:2397]
```
    int  killer() const;
```
[16.2372]
[3.7707]
```
    killer_type  killer() const;
```
Replacement in crawl-ref/source/externs.h at line 945 [6.3270163]
B:BD[15.30503] → [15.30503:30527]
```
    int killer() const;
```
[15.30503]
[15.30527]
```
    killer_type killer() const;
```
Replacement in crawl-ref/source/beam.cc at line 4467 [6.4128068]
B:BD[16.4568] → [16.4568:4593]
```
int bolt::killer() const
```
[16.4568]
[16.4593]
```
killer_type bolt::killer() const
```

[1747353] Allies shouldn't be noted as "defeated" by you.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 1900 [6.804403]

Replacement in crawl-ref/source/notes.cc at line 289 [9.370339]

Replacement in crawl-ref/source/monstuff.h at line 50 [6.1390580]

Replacement in crawl-ref/source/monstuff.h at line 53 [6.1390580]

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

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

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

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

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

Replacement in crawl-ref/source/mon-util.cc at line 4243 [6.1699344]

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

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

Replacement in crawl-ref/source/beam.cc at line 4467 [6.4128068]