fiddlerwoaroof/crawl - Change QLIDDODO7Q7S2UTKVR2SMRMEAXHRPA5C7SU267EQGV6VJ7UXW5JQC

Properly use apostrophise() in a few more places.

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

Created by dolorous on January 6, 2009

QLIDDODO7Q7S2UTKVR2SMRMEAXHRPA5C7SU267EQGV6VJ7UXW5JQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 20 [5.3]
[5.287]
[5.287]
```
#include "Kills.h"
```

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

B:BD[6.6238] → [6.6238:6303]

B:BD[6.6303] → [2.715:782]

        std::string msg = mon->name(desc);
        msg += "'s ";
        msg = replace_all(msg, "s's", "s'"); // Proper possessive.

[6.6238]

[6.6369]

        std::string msg = apostrophise(mon->name(desc));

Insertion in crawl-ref/source/spl-book.cc at line 35 [7.397614]
[7.398355]
[8.46649]
```
#include "Kills.h"
```

Replacement in crawl-ref/source/spl-book.cc at line 1954 [7.397614]

B:BD[9.327] → [9.327:373]

        name += god_name(god, false) + "'s ";

[9.327]

[10.269]

        name += apostrophise(god_name(god, false)) + " ";

Replacement in crawl-ref/source/spl-book.cc at line 1956 [7.397614]

B:BD[10.300] → [10.300:356]

        name += make_name(random_int(), false) + "'s ";

[10.300]

[3.965]

        name += apostrophise(make_name(random_int(), false)) + " ";

Replacement in crawl-ref/source/spl-book.cc at line 2414 [7.397614]
B:BD[4.2917] → [4.2917:2952]
```
        name = '"' + name + "'s ";
```
[4.2917]
[4.2952]
```
        name = "\"" + apostrophise(name) + " ";
```
Insertion in crawl-ref/source/religion.cc at line 44 [7.804403]
[7.805515]
[11.172]
```
#include "Kills.h"
```

Replacement in crawl-ref/source/religion.cc at line 5552 [7.804403]

B:BD[12.4937] → [12.4937:4999]

    const std::string name_cap_the = mon->name(DESC_CAP_THE);

[12.4937]

[12.4999]

    const std::string name = apostrophise(mon->name(DESC_CAP_THE));

Replacement in crawl-ref/source/religion.cc at line 5561 [7.804403]
B:BD[12.5199] → [12.5199:5251]
```
        mprf("%s's soul %s.", name_cap_the.c_str(),
```
[12.5199]
[12.5251]
```
        mprf("%s soul %s.", name.c_str(),
```
Replacement in crawl-ref/source/religion.cc at line 5601 [7.804403]
B:BD[12.6458] → [12.6458:6510]
```
        mprf("%s's soul %s.", name_cap_the.c_str(),
```
[12.6458]
[12.6510]
```
        mprf("%s soul %s.", name.c_str(),
```

Replacement in crawl-ref/source/monstuff.cc at line 989 [7.1396662]

B:BD[13.11132] → [14.5090:5150]

∅:D[14.5150] → [13.11181:11231]

B:BD[13.11181] → [13.11181:11231]

        place_cloud( cloud, monster->pos(), 1 + random2(3),
                     monster->kill_alignment() );

[13.11132]

[15.74908]

        place_cloud(cloud, monster->pos(), 1 + random2(3),
                    monster->kill_alignment());

Replacement in crawl-ref/source/monstuff.cc at line 4261 [7.1396662]

B:BD[16.220] → [17.302:367]

                            msg_channel_type channel, int param,

[16.220]

[18.528]

                            msg_channel_type channel,
                            int param,

Replacement in crawl-ref/source/hiscores.cc at line 1087 [7.2987663]

B:BD[19.829298] → [19.829298:829357]

                struct passwd *pw_entry = getpwuid( uid );

[19.829298]

[20.1971]

                struct passwd *pw_entry = getpwuid(uid);

Replacement in crawl-ref/source/hiscores.cc at line 1090 [7.2987663]

B:BD[20.2019] → [20.2019:2220]

                    strncpy( username, pw_entry->pw_name, sizeof(username) );
                    strncat( username, "'s", sizeof(username) );
                    username[0] = toupper( username[0] );

[20.2019]

[20.2220]

                    strncpy(username, pw_entry->pw_name, sizeof(username));
                    username[0] = toupper(username[0]);
                    strncat(username, "'s", sizeof(username));

Replacement in crawl-ref/source/hiscores.cc at line 1096 [7.2987663]

B:BD[19.829630] → [19.829630:829706]

B:BD[19.829706] → [21.870:974]

            snprintf( scratch, INFO_SIZE, "%s game lasted %s (%ld turns).",
                      username, make_time_string(real_time).c_str(),
                      num_turns );

[19.829567]

[19.829756]

            snprintf(scratch, INFO_SIZE, "%s game lasted %s (%ld turns).",
                     username, make_time_string(real_time).c_str(),
                     num_turns);

Replacement in crawl-ref/source/fight.cc at line 474 [7.3140790]

B:BD[22.6472] → [22.6472:6634]

    {
        name = atk_name(desc);
        name += "'s ";
        // Proper English-language possessive.
        name = replace_all(name, "s's ", "s' ");
    }

[22.6472]

[22.6634]

        name = apostrophise(atk_name(desc));

Replacement in crawl-ref/source/Kills.cc at line 358 [24.558235]

B:BD[23.5210] → [23.5210:5324]

    const char lastc = name[ name.length() - 1 ];
    return (name + (lastc == 's' || lastc == 'x'? "'" : "'s"));

[23.5210]

[23.5324]

    const char lastc = name[name.length() - 1];
    return (name + (lastc == 's' || lastc == 'x' ? "'" : "'s"));