fiddlerwoaroof/crawl - Change TV3ZC6WOZKSQQJQN26JIVKCHK6UK7WMDBYZDUYRWEAZ4JB4YVNAAC

Merged in crawl.akrasiac.org patches (simple messaging, milestones). These take

effect only if compiled with -DDGAMELAUNCH.

Simple messaging: interacts with dgamelaunch's messaging facility allowing viewers to send messages to the player.

Milestones: Writes a milestones.txt file (in xlogfile format) for things like the player killing uniques, reaching the end of a dungeon branch, etc. (similar to notes). milestones.txt is used for game announcements by an IRC bot.

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

Created by dshaligram on March 25, 2007

TV3ZC6WOZKSQQJQN26JIVKCHK6UK7WMDBYZDUYRWEAZ4JB4YVNAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/stuff.cc at line 410 [6.224557]
[6.231942]
[7.59]
```
#ifdef SIMPLE_MESSAGING
    update_message_status();
#endif
```
Replacement in crawl-ref/source/spl-cast.cc at line 1925 [6.293070]
B:BD[6.343702] → [8.188482:188507]
```
static bool send_abyss()
```
[6.343702]
[8.188507]
```
static bool send_abyss(const char *cause)
```

Replacement in crawl-ref/source/spl-cast.cc at line 1930 [6.293070]

B:BD[8.188615] → [8.188615:188681]

        banished(DNGN_ENTER_ABYSS);     // sends you to the abyss

[8.188599]

[8.188681]

        banished(DNGN_ENTER_ABYSS, cause? cause : "");

Replacement in crawl-ref/source/spl-cast.cc at line 2329 [6.293070]
B:BD[6.355996] → [8.188816:188846]
```
                send_abyss();
```
[6.355996]
[6.356147]
```
                send_abyss(cause);
```
Replacement in crawl-ref/source/spl-cast.cc at line 2350 [6.293070]
B:BD[6.356796] → [8.188847:188877]
```
                send_abyss();
```
[6.356796]
[6.356947]
```
                send_abyss(cause);
```
Replacement in crawl-ref/source/spl-cast.cc at line 2523 [6.293070]
B:BD[6.363036] → [8.188878:188908]
```
                send_abyss();
```
[6.363036]
[6.363133]
```
                send_abyss(cause);
```
Replacement in crawl-ref/source/religion.cc at line 1008 [6.804403]
B:BD[6.828917] → [6.828917:828957]
```
            banished(DNGN_ENTER_ABYSS);
```
[6.828917]
[6.828957]
```
            banished(DNGN_ENTER_ABYSS, "Xom");
```
Insertion in crawl-ref/source/player.cc at line 4504 [6.962854]
[9.142]
[2.610]
```
    banished_by.clear();
    
```
Replacement in crawl-ref/source/player.cc at line 4949 [6.962854]
B:BD[10.2484] → [10.2484:2506]
```
void player::banish()
```
[10.2484]
[10.2506]
```
void player::banish(const std::string &who)
```
Replacement in crawl-ref/source/player.cc at line 4951 [6.962854]
B:BD[10.2508] → [10.2508:2529]
```
    banished = true;
```
[10.2508]
[11.7161]
```
    banished    = true;
    banished_by = who;
```
Insertion in crawl-ref/source/output.h at line 18 [6.1087719]
[12.513]
[7.121]
```
#ifdef SIMPLE_MESSAGING
void update_message_status();
#endif
```

Insertion in crawl-ref/source/output.cc at line 61 [6.1088282]

[6.1089379]

}
#ifdef SIMPLE_MESSAGING
void update_message_status()
{
    textcolor(LIGHTBLUE);
    gotoxy(75, 2);
    if (SysEnv.have_messages)
        cprintf("(msg)");
    else
        cprintf("     ");
    textcolor(LIGHTGREY);

Insertion in crawl-ref/source/output.cc at line 75 [6.1088282]
[6.1089381]
[6.1089381]
```
#endif
```
Insertion in crawl-ref/source/notes.h at line 60 [13.368326]
[12.9125]
[13.370032]
```
    void check_milestone() const;
```
Insertion in crawl-ref/source/notes.cc at line 13 [13.370339]
[13.370500]
[13.370500]
```
#include "hiscores.h"
```

Insertion in crawl-ref/source/notes.cc at line 342 [13.370339]

[13.379999]


void Note::check_milestone() const {
#ifdef MILESTONES
    if (type == NOTE_DUNGEON_LEVEL_CHANGE) {
        const int br = place_branch(packed_place),
            dep = place_depth(packed_place);

Replacement in crawl-ref/source/notes.cc at line 349 [13.370339]

B:BD[13.380000] → [14.73761:73797]

void Note::save( FILE* fp ) const
{

[13.380000]

[13.380036]

        if (br != -1)
        {
            std::string branch = place_name(packed_place, true, false).c_str();
            if (branch.find("The ") == 0)
                branch[0] = tolower(branch[0]);
            
            if (dep == 1)
                mark_milestone("enter", "entered " + branch + ".");
            else if (dep == dungeon_branch_depth(br))
            {
                char branch_finale[500];
                std::string level = place_name(packed_place, true, true);
                if (level.find("Level ") == 0)
                    level[0] = tolower(level[0]);
                
                snprintf(branch_finale, sizeof branch_finale,
                         "reached %s.", level.c_str());
                mark_milestone("branch-finale", branch_finale);
            }
        }
    }
#endif
}
void Note::save( FILE* fp ) const {

Insertion in crawl-ref/source/notes.cc at line 404 [13.370339]
[15.225]
[16.8742]
```
    {
```
Insertion in crawl-ref/source/notes.cc at line 406 [13.370339]
[16.8779]
[13.380694]
```
        note.check_milestone();
    }
```
Replacement in crawl-ref/source/mstuff2.cc at line 1306 [6.1340842]
B:BD[6.1376229] → [6.1376229:1376254]
```
        beam.hit = 1500;
```
[6.1376229]
[6.1376254]
```
        beam.hit = AUTOMATIC_HIT;
```
Insertion in crawl-ref/source/monstuff.cc at line 37 [6.1396662]
[6.1397631]
[6.1397631]
```
#include "describe.h"
```
Insertion in crawl-ref/source/monstuff.cc at line 40 [6.1396662]
[6.1397671]
[6.1397671]
```
#include "hiscores.h"
```

Insertion in crawl-ref/source/monstuff.cc at line 345 [6.1396662]

[4.785]

}
#ifdef MILESTONES
static std::string milestone_kill_verb(int killer)
{
    return (killer == KILL_RESET? "banished " : "killed ");

Insertion in crawl-ref/source/monstuff.cc at line 353 [6.1396662]

[4.788]

[17.218]

static void check_kill_milestone(const monsters *mons, int killer, int i)
{
    if (mons->type == MONS_PLAYER_GHOST)
    {
        std::string milestone = milestone_kill_verb(killer) + "the ghost of ";
        milestone += ghost_description(*mons, true);
        milestone += ".";
        mark_milestone("ghost", milestone);
    }
    else if (mons_is_unique(mons->type))
    {
        mark_milestone("unique",
                       milestone_kill_verb(killer)
                       + mons->name(DESC_NOCAP_THE, true)
                       + ".");
    }
}
#endif // MILESTONES

Insertion in crawl-ref/source/monstuff.cc at line 384 [6.1396662]
[6.1405840]
[6.1405840]
```
#ifdef MILESTONES
    check_kill_milestone(monster, killer, i);
#endif
    
```

Replacement in crawl-ref/source/monplace.cc at line 860 [6.1641732]

B:BD[13.456058] → [13.456058:456135]

           band = BAND_DRACONIAN;
           band_size = random_range(2, 4);

[13.456058]

[13.456135]

            band = BAND_DRACONIAN;
            band_size = random_range(2, 4);

Replacement in crawl-ref/source/monplace.cc at line 873 [6.1641732]

B:BD[13.456411] → [13.456411:456488]

           band = BAND_DRACONIAN;
           band_size = random_range(3, 6);

[13.456411]

[13.456488]

            band = BAND_DRACONIAN;
            band_size = random_range(3, 6);

Insertion in crawl-ref/source/mon-util.cc at line 2556 [6.1699344]

[11.9904]

}
std::string monsters::name(description_level_type desc, bool force_vis) const
{
    if (!force_vis || !has_ench(ENCH_INVIS))
        return (name(desc));
    monsters m = *this;
    m.del_ench(ENCH_INVIS, true);
    return (m.name(desc));

Replacement in crawl-ref/source/mon-util.cc at line 2625 [6.1699344]
B:BD[10.12614] → [10.12614:12638]
```
void monsters::banish()
```
[10.12614]
[10.12638]
```
void monsters::banish(const std::string &)
```
Insertion in crawl-ref/source/misc.h at line 171 [6.1928926]
[6.1933555]
[13.541323]
```
int place_branch(unsigned short place);
int place_depth(unsigned short place);
```

Insertion in crawl-ref/source/misc.cc at line 1943 [6.1933596]

[13.549096]

int place_branch(unsigned short place)
{
    const unsigned branch = (unsigned) ((place >> 8) & 0xFF);
    const int lev = place & 0xFF;
    return lev == 0xFF? -1 : branch;
}
int place_depth(unsigned short place)
{
    const int lev = place & 0xFF;
    return lev == 0xFF? -1 : lev;
}

Insertion in crawl-ref/source/items.cc at line 41 [6.2584728]
[6.2585613]
[6.2585613]
```
#include "hiscores.h"
```

Insertion in crawl-ref/source/items.cc at line 961 [6.2584728]

[8.346031]

}
#ifdef MILESTONES
static std::string milestone_rune(const item_def &item)
{
    return std::string("found ") + item_name( item, DESC_NOCAP_A ) + ".";

Insertion in crawl-ref/source/items.cc at line 969 [6.2584728]

[8.346034]

static void milestone_check(const item_def &item)
{
    if (item.base_type == OBJ_MISCELLANY
        && item.sub_type == MISC_RUNE_OF_ZOT)
    {
        mark_milestone("rune", milestone_rune(item));
    }
    else if (item.base_type == OBJ_ORBS && item.sub_type == ORB_ZOT)
    {
        mark_milestone("orb", "found the Orb of Zot!");
    }
}
#endif // MILESTONES

Insertion in crawl-ref/source/items.cc at line 992 [6.2584728]
[8.346329]
[8.346329]
Insertion in crawl-ref/source/items.cc at line 996 [6.2584728]
[8.346456]
[8.346456]
```
#ifdef MILESTONES
        milestone_check(item);
#endif
```
Insertion in crawl-ref/source/items.cc at line 1015 [6.2584728]
[8.346815]
[8.346815]
```
#ifdef MILESTONES
        milestone_check(item);
#endif
```
Insertion in crawl-ref/source/initfile.cc at line 552 [6.2957258]
[13.791252]
[13.791252]
```
#ifdef SIMPLE_MESSAGING
    messaging = true;
#endif
```

Replacement in crawl-ref/source/initfile.cc at line 1831 [6.2957258]

∅:D[16.14179] → [18.1414:1423]

B:BD[18.1414] → [18.1414:1423]

[16.14179]

[13.805000]

    }
#ifdef SIMPLE_MESSAGING
    else if (key == "messaging")
    {
        messaging = read_bool(field, messaging);
    }
#endif

Insertion in crawl-ref/source/initfile.cc at line 2375 [6.2957258]

[6.2981215]

#ifdef SIMPLE_MESSAGING
    // Enable SIMPLE_MESSAGING only if SIMPLEMAIL and MAIL are set.
    const char *simplemail = getenv("SIMPLEMAIL");
    if (simplemail && strcmp(simplemail, "0"))
    {
        const char *mail = getenv("MAIL");
        SysEnv.messagefile = mail? mail : "";
    }
#endif

Insertion in crawl-ref/source/hiscores.h at line 43 [6.2986382]

[5.788]


#ifdef MILESTONES
void mark_milestone(const std::string &type, const std::string &milestone);
#endif

Insertion in crawl-ref/source/hiscores.h at line 120 [6.2986382]
[5.3719]
[5.3719]
```
    mutable std::auto_ptr<xlog_fields> fields;
```

Insertion in crawl-ref/source/hiscores.h at line 154 [6.2986382]

[5.4798]

    void set_base_xlog_fields() const;

Deletion in crawl-ref/source/hiscores.h at line 157 [6.2986382]
B:BD[5.4807] → [5.4807:4868]
```
    mutable std::auto_ptr<xlog_fields> fields;
    
private:
```
Replacement in crawl-ref/source/hiscores.cc at line 747 [6.2987663]
B:BD[19.14355] → [19.14355:14402]
```
void scorefile_entry::set_score_fields() const
```
[19.14355]
[19.14402]
```
void scorefile_entry::set_base_xlog_fields() const
```
Deletion in crawl-ref/source/hiscores.cc at line 749 [6.2987663]
B:BD[19.14404] → [5.7409:7444]
∅:D[5.7444] → [19.14439:14440]
B:BD[19.14439] → [19.14439:14440]
```
    fields.reset(new xlog_fields);
```
Replacement in crawl-ref/source/hiscores.cc at line 750 [6.2987663]
∅:D[19.14463] → [6.3040104:3040120]
B:BD[6.3040104] → [6.3040104:3040120]
```
        return;
```
[19.14463]
[19.14464]
```
        fields.reset(new xlog_fields);
```
Deletion in crawl-ref/source/hiscores.cc at line 754 [6.2987663]
B:BD[5.7526] → [5.7526:7570]
```
    fields->add_field("sc", "%ld", points);
```

Deletion in crawl-ref/source/hiscores.cc at line 763 [6.2987663]

B:BD[19.15020] → [5.8014:8149]

∅:D[5.8149] → [19.15139:15140]

B:BD[19.15139] → [19.15139:15140]

B:BD[19.15140] → [5.8150:8208]

    fields->add_field("ktyp", ::kill_method_name(kill_method_type(death_type)));
    fields->add_field("killer", death_source_desc());
    fields->add_field("kaux", "%s", auxkilldata.c_str());

Deletion in crawl-ref/source/hiscores.cc at line 774 [6.2987663]
B:BD[5.8573] → [5.8573:8617]
```
    fields->add_field("dam", "%d", damage);
```
Replacement in crawl-ref/source/hiscores.cc at line 781 [6.2987663]
∅:D[5.8822] → [19.15864:15883]
B:BD[19.15864] → [19.15864:15883]
B:BD[19.15883] → [5.8823:8872]
∅:D[5.8872] → [19.15924:15945]
B:BD[19.15924] → [19.15924:15945]
B:BD[19.15945] → [5.8873:8922]
```
    if (piety > 0)
        fields->add_field("piety", "%d", piety);
    if (penance > 0)
        fields->add_field("pen", "%d", penance);
```
[5.8822]
[19.15986]
Deletion in crawl-ref/source/hiscores.cc at line 786 [6.2987663]
B:BD[5.9050] → [5.9050:9124]
```
    fields->add_field("end", "%s", make_date_string(death_time).c_str());
```

Replacement in crawl-ref/source/hiscores.cc at line 793 [6.2987663]

B:BD[19.16361] → [5.9281:9334]

        fields->add_field("nrune", "%d", num_runes);

[19.16361]

[19.16406]

        fields->add_field("nrune", "%d", num_runes);    
}
void scorefile_entry::set_score_fields() const
{
    fields.reset(new xlog_fields);
    if (!fields.get())
        return;
    set_base_xlog_fields();
    
    fields->add_field("sc", "%ld", points);
    fields->add_field("ktyp", ::kill_method_name(kill_method_type(death_type)));
    fields->add_field("killer", death_source_desc());
    fields->add_field("kaux", "%s", auxkilldata.c_str());
    if (piety > 0)
        fields->add_field("piety", "%d", piety);
    if (penance > 0)
        fields->add_field("pen", "%d", penance);
    
    fields->add_field("end", "%s", make_date_string(death_time).c_str());

Insertion in crawl-ref/source/hiscores.cc at line 1113 [6.2987663]

[13.825581]

    const bool calc_item_values =
        (death_type == KILLED_BY_LEAVING || death_type == KILLED_BY_WINNING);

Replacement in crawl-ref/source/hiscores.cc at line 1117 [6.2987663]
B:BD[13.825652] → [13.825652:825728]
```
    if (death_type == KILLED_BY_LEAVING || death_type == KILLED_BY_WINNING)
```
[13.825652]
[13.825728]
```
    for (int d = 0; d < ENDOFPACK; d++)
```
Replacement in crawl-ref/source/hiscores.cc at line 1119 [6.2987663]
B:BD[13.825734] → [13.825734:825778]
```
        for (int d = 0; d < ENDOFPACK; d++)
```
[13.825734]
[13.825778]
```
        if (is_valid_item( you.inv[d] ))
```
Replacement in crawl-ref/source/hiscores.cc at line 1121 [6.2987663]
B:BD[13.825788] → [13.825788:825847]
```
            if (is_valid_item( you.inv[d] ))
            {
```
[13.825788]
[13.825847]
```
            if (calc_item_values)
```

Replacement in crawl-ref/source/hiscores.cc at line 1124 [6.2987663]

B:BD[13.825915] → [13.825915:826158]

                if (you.inv[d].base_type == OBJ_MISCELLANY
                    && you.inv[d].sub_type == MISC_RUNE_OF_ZOT)
                {
                    if (rune_array[ you.inv[d].plus ] == 0)
                        num_diff_runes++;

[13.825915]

[13.826158]

            if (you.inv[d].base_type == OBJ_MISCELLANY
                && you.inv[d].sub_type == MISC_RUNE_OF_ZOT)
            {
                if (rune_array[ you.inv[d].plus ] == 0)
                    num_diff_runes++;

Replacement in crawl-ref/source/hiscores.cc at line 1130 [6.2987663]

B:BD[13.826159] → [13.826159:826305]

                    num_runes += you.inv[d].quantity;
                    rune_array[ you.inv[d].plus ] += you.inv[d].quantity;
                }

[13.826159]

[13.826305]

                num_runes += you.inv[d].quantity;
                rune_array[ you.inv[d].plus ] += you.inv[d].quantity;

Insertion in crawl-ref/source/hiscores.cc at line 1134 [6.2987663]
[13.826329]
[13.826329]
```
    }
```

Replacement in crawl-ref/source/hiscores.cc at line 1136 [6.2987663]

B:BD[13.826330] → [13.826330:826622]

        // Bonus for exploring different areas, not for collecting a 
        // huge stack of demonic runes in Pandemonium (gold value 
        // is enough for those). -- bwr
        if (num_diff_runes >= 3)
            points += ((num_diff_runes + 2) * (num_diff_runes + 2) * 1000);
    }

[13.826330]

[13.826622]

    // Bonus for exploring different areas, not for collecting a 
    // huge stack of demonic runes in Pandemonium (gold value 
    // is enough for those). -- bwr
    if (calc_item_values && num_diff_runes >= 3)
        points += ((num_diff_runes + 2) * (num_diff_runes + 2) * 1000);

Insertion in crawl-ref/source/hiscores.cc at line 2086 [6.2987663]

[5.12774]


///////////////////////////////////////////////////////////////////////////////
// Milestones
#ifdef MILESTONES
void mark_milestone(const std::string &type, const std::string &milestone)
{
    const std::string milestone_file = Options.save_dir + "milestones.txt";
    if (FILE *fp = lk_open("a", milestone_file))
    {
        const scorefile_entry se(0, 0, KILL_MISC, NULL);
        se.set_base_xlog_fields();
        xlog_fields xl = *se.fields;
        xl.add_field("time", "%s", make_date_string(se.death_time).c_str());
        xl.add_field("type", "%s", type.c_str());
        xl.add_field("milestone", "%s", milestone.c_str());
        fprintf(fp, "%s\n", xl.xlog_line().c_str());
        lk_close(fp, "a", milestone_file);
    }
}
#endif // MILESTONES

Insertion in crawl-ref/source/files.h at line 96 [6.3082298]

[20.27508]


// file locking stuff
#ifdef USE_FILE_LOCKING
bool lock_file_handle( FILE *handle, int type );
bool unlock_file_handle( FILE *handle );
#endif // USE_FILE_LOCKING

Deletion in crawl-ref/source/files.cc at line 88 [6.3084589]

B:BD[6.3086304] → [20.27511:27688]

∅:D[20.27688] → [6.3087661:3087662]

B:BD[6.3087661] → [6.3087661:3087662]

// file locking stuff
#ifdef USE_FILE_LOCKING
static bool lock_file_handle( FILE *handle, int type );
static bool unlock_file_handle( FILE *handle );
#endif // USE_FILE_LOCKING

Replacement in crawl-ref/source/files.cc at line 1523 [6.3084589]
B:BD[20.29341] → [20.29341:29396]
```
static bool lock_file_handle( FILE *handle, int type )
```
[20.29341]
[20.29396]
```
bool lock_file_handle( FILE *handle, int type )
```
Deletion in crawl-ref/source/files.cc at line 1534 [6.3084589]
B:BD[20.29571] → [20.29571:29572]
Deletion in crawl-ref/source/files.cc at line 1535 [6.3084589]
B:BD[20.29629] → [20.29629:29630]
Deletion in crawl-ref/source/files.cc at line 1536 [6.3084589]
B:BD[20.29636] → [20.29636:29637]
Deletion in crawl-ref/source/files.cc at line 1551 [6.3084589]
B:BD[20.29999] → [20.29999:30000]
Replacement in crawl-ref/source/files.cc at line 1556 [6.3084589]
B:BD[20.30036] → [20.30036:30083]
```
static bool unlock_file_handle( FILE *handle )
```
[20.30036]
[20.30083]
```
bool unlock_file_handle( FILE *handle )
```

Replacement in crawl-ref/source/fight.cc at line 1728 [6.3140790]

B:BD[11.63085] → [10.63624:63656]

            defender->banish();

[11.63085]

[11.63130]

            defender->banish( atk? atk->name(DESC_PLAIN, true)
                              : attacker->name(DESC_PLAIN) );

Replacement in crawl-ref/source/externs.h at line 148 [6.3270163]
B:BD[10.84373] → [10.84373:84404]
```
    virtual void banish() = 0;
```
[10.84373]
[10.84404]
```
    virtual void banish(const std::string &who = "") = 0;
```

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

B:BD[6.3275566] → [9.889:997]

  bool banished;     // flag signaling that the player is due a visit to the
                     // Abyss.

[6.3275566]

[2.1756]

  // If true, player is headed to the Abyss.
  bool banished;
  std::string banished_by;

Replacement in crawl-ref/source/externs.h at line 735 [6.3270163]
B:BD[11.83143] → [11.83143:83148]
```
    
```
[11.83143]
[11.83148]
Replacement in crawl-ref/source/externs.h at line 745 [6.3270163]
B:BD[11.83415] → [10.86518:86537]
```
    void banish();
```
[11.83415]
[10.86537]
```
    void banish(const std::string &who = "");
```

Insertion in crawl-ref/source/externs.h at line 949 [6.3270163]

[11.84011]

[10.88506]

    std::string name(description_level_type type, bool force_visible) const;

Replacement in crawl-ref/source/externs.h at line 960 [6.3270163]
B:BD[11.84221] → [10.88623:88642]
```
    void banish();
```
[11.84221]
[10.88642]
```
    void banish(const std::string &who = "");
```

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

B:BD[6.3283070] → [6.3283070:3283192]

    char *home;                 // only used by MULTIUSER systems
    bool  board_with_nail;      // Easter Egg silliness

[6.3283070]

[13.898160]

    char *home;                    // only used by MULTIUSER systems
    bool  board_with_nail;         // Easter Egg silliness
#ifdef SIMPLE_MESSAGING
    std::string messagefile;       // File containing messages from other users.
    bool have_messages;            // There are messages waiting to be read.
    unsigned  message_check_tick;
#endif

Insertion in crawl-ref/source/externs.h at line 1219 [6.3270163]

[6.3283231]

[13.898597]

#ifdef SIMPLE_MESSAGING
    bool        messaging;      // Check for messages.
#endif

Insertion in crawl-ref/source/enum.h at line 629 [6.3287960]
[13.906435]
[13.906435]
```
    CMD_READ_MESSAGES,
```
Replacement in crawl-ref/source/effects.h at line 25 [6.3378996]
B:BD[6.3379521] → [9.1005:1035]
```
void banished(int gate_type);
```
[6.3379521]
[6.3379561]
```
void banished(int gate_type, const std::string &who = "");
```
Insertion in crawl-ref/source/effects.cc at line 24 [6.3382105]
[6.3382473]
[6.3382473]
```
#include "hiscores.h"
```

Replacement in crawl-ref/source/effects.cc at line 132 [6.3382105]

B:BD[6.3384106] → [9.1037:1066]

void banished(int gate_type)

[6.3384106]

[6.3384145]

static std::string who_banished(const std::string &who)
{
    return (who.empty()? who : " (" + who + ")");
}
void banished(int gate_type, const std::string &who)

Insertion in crawl-ref/source/effects.cc at line 139 [6.3382105]
[6.3384147]
[9.1067]
```
#ifdef MILESTONES
```

Insertion in crawl-ref/source/effects.cc at line 141 [6.3382105]

[9.1106]

        mark_milestone("abyss.enter", who_banished(who));
    else if (gate_type == DNGN_EXIT_ABYSS)
        mark_milestone("abyss.exit", who_banished(who));
#endif
    if (gate_type == DNGN_ENTER_ABYSS)

Replacement in crawl-ref/source/effects.cc at line 148 [6.3382105]

∅:D[9.1112] → [15.383:459]

B:BD[15.383] → [15.383:459]

        take_note(Note(NOTE_USER_NOTE, 0, 0, "Cast into the Abyss"), true);

[9.1112]

[9.1113]

        const std::string what = "Cast into the Abyss" + who_banished(who);
        take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true);

Replacement in crawl-ref/source/dungeon.cc at line 4739 [6.3429798]

B:BD[3.3133] → [3.3133:3219]

    if (player_in_branch(BRANCH_VESTIBULE_OF_HELL)
        && one_chance_in(7))
    {

[3.3133]

[3.3219]

    if (player_in_branch(BRANCH_VESTIBULE_OF_HELL) && one_chance_in(7))

Deletion in crawl-ref/source/dungeon.cc at line 4741 [6.3429798]
B:BD[3.3255] → [3.3255:3261]
```
    }
```
Replacement in crawl-ref/source/describe.cc at line 6358 [6.3736416]
B:BD[8.476853] → [8.476853:476889]
```
            "%s the %s, a%s %s %s",
```
[8.476853]
[20.34023]
```
              "%s the %s, a%s %s%s%s",
```
Replacement in crawl-ref/source/describe.cc at line 6378 [6.3736416]
B:BD[8.477778] → [8.477778:477779]
[8.477778]
[8.477779]
```
              
            ( concise? "" : " " ),
              
```
Deletion in crawl-ref/source/decks.cc at line 515 [6.3987460]
B:BD[6.3999871] → [6.3999871:3999887]
```
        more();
```
Replacement in crawl-ref/source/decks.cc at line 517 [6.3987460]
B:BD[6.3999931] → [6.3999931:3999970]
```
            banished(DNGN_EXIT_ABYSS);
```
[6.3999931]
[6.3999970]
```
            banished(DNGN_EXIT_ABYSS, "drew the Gate");
```
Replacement in crawl-ref/source/decks.cc at line 523 [6.3987460]
∅:D[9.1253] → [6.4000080:4000120]
B:BD[6.4000080] → [6.4000080:4000120]
```
            banished(DNGN_ENTER_ABYSS);
```
[9.1253]
[9.1254]
```
            banished(DNGN_ENTER_ABYSS, "drew the Gate");
```

Insertion in crawl-ref/source/beam.cc at line 74 [6.4128068]

[13.1220159]

[6.4130210]

static int beam_source(const bolt &beam);
static std::string beam_zapper(const bolt &beam);

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

B:BD[21.370] → [21.370:426]

    return (random2(attack) >= random2avg(defence, 2));

[21.370]

[21.426]

    return (attack == AUTOMATIC_HIT
            || random2(attack) >= random2avg(defence, 2));
}
static std::string beam_zapper(const bolt &beam)
{
    const int bsrc = beam_source(beam);
    if (bsrc == MHITYOU)
        return ("self");
    else if (bsrc == MHITNOT)
        return ("");
    else
        return ptr_monam( &menv[bsrc], DESC_PLAIN );

Insertion in crawl-ref/source/beam.cc at line 3108 [6.4128068]
[9.1318]
[13.1244519]
```
            you.banished_by = beam_zapper(beam);
```
Insertion in crawl-ref/source/acr.cc at line 168 [6.4397395]
[13.1256126]
[6.4402708]
```
#ifdef SIMPLE_MESSAGING
static void read_messages();
#endif
```

Insertion in crawl-ref/source/acr.cc at line 987 [6.4397395]

[6.4422951]

[13.1261440]

#ifdef MILESTONES
    // Not entirely accurate - the player could die before reaching the Abyss.
    if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS)
        mark_milestone("abyss.enter", "entered the Abyss!");
    else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)
        mark_milestone("abyss.exit", "escaped from the Abyss!");
#endif

Insertion in crawl-ref/source/acr.cc at line 1122 [6.4397395]

[13.1265330]

[12.16877]

        break;
    case CMD_READ_MESSAGES:
#ifdef SIMPLE_MESSAGING
        if (SysEnv.have_messages)
            read_messages();
#endif

Deletion in crawl-ref/source/acr.cc at line 2167 [6.4397395]
∅:D[9.1477] → [13.1269837:1269838]
B:BD[13.1269837] → [13.1269837:1269838]

Replacement in crawl-ref/source/acr.cc at line 2170 [6.4397395]

B:BD[9.1580] → [9.1580:1620]

            banished(DNGN_ENTER_ABYSS);

[9.1580]

[9.1620]

            banished(DNGN_ENTER_ABYSS, you.banished_by);

Insertion in crawl-ref/source/acr.cc at line 2172 [6.4397395]
[9.1630]
[9.1630]
```
        you.banished_by.clear();
```

Insertion in crawl-ref/source/acr.cc at line 2369 [6.4397395]

[6.4464325]

}
#ifdef SIMPLE_MESSAGING
static struct stat mfilestat;
static void show_message_line(std::string line)
{
    const std::string::size_type sender_pos = line.find(":");
    if (sender_pos == std::string::npos)
        mpr(line.c_str());
    else
    {
        std::string sender = line.substr(0, sender_pos);
        line = line.substr(sender_pos + 1);
        trim_string(line);
        // XXX: Eventually fix mpr so it can do a different colour for
        // the sender.
        mprf("%s: %s", sender.c_str(), line.c_str());
    }

Insertion in crawl-ref/source/acr.cc at line 2391 [6.4397395]

[6.4464328]

[22.636]

static void read_each_message()
{
    bool say_got_msg = true;
    FILE *mf = fopen(SysEnv.messagefile.c_str(), "r+");
    if (!mf)
    {
        mprf(MSGCH_WARN, "Couldn't read %s: %s", SysEnv.messagefile.c_str(),
             strerror(errno));
        goto kill_messaging;
    }
    // Read messages, code borrowed from the SIMPLEMAIL patch.
    char line[120];
    
    if (!lock_file_handle(mf, F_RDLCK))
    {
        mprf(MSGCH_WARN, "Failed to lock %s: %s", SysEnv.messagefile.c_str(),
             strerror(errno));
        goto kill_messaging;
    }
    while (fgets(line, sizeof line, mf))
    {
        unlock_file_handle(mf);
        const int len = strlen(line);
        if (len)
        {
            if (line[len - 1] == '\n')
                line[len - 1] = 0;
            if (say_got_msg)
            {
                mprf(MSGCH_PROMPT, "Your messages:");
                say_got_msg = false;
            }
            show_message_line(line);
        }
        if (!lock_file_handle(mf, F_RDLCK))
        {
            mprf(MSGCH_WARN, "Failed to lock %s: %s",
                 SysEnv.messagefile.c_str(),
                 strerror(errno));
            goto kill_messaging;
        }
    }
    if (!lock_file_handle(mf, F_WRLCK))
    {
        mprf(MSGCH_WARN, "Unable to write lock %s: %s",
             SysEnv.messagefile.c_str(),
             strerror(errno));
    }
    if (!ftruncate(fileno(mf), 0))
        mfilestat.st_mtime = 0;
    unlock_file_handle(mf);
    fclose(mf);
    SysEnv.have_messages = false;
    return;
kill_messaging:
    if (mf)
        fclose(mf);
    SysEnv.have_messages = false;
    Options.messaging = false;
}
static void read_messages()
{
    read_each_message();
    update_message_status();
}
static void announce_messages()
{
    // XXX: We could do a NetHack-like mail daemon here at some point.
    mprf("Beep! Your pager goes off! Use _ to check your messages.");
}
static void check_messages()
{
    if (!Options.messaging
        || SysEnv.have_messages
        || SysEnv.messagefile.empty()
        || kbhit()
        || (SysEnv.message_check_tick++ % MESSAGE_CHECK_INTERVAL))
    {
        return;
    }
    const bool had_messages = SysEnv.have_messages;
    struct stat st;
    if (stat(SysEnv.messagefile.c_str(), &st))
    {
        mfilestat.st_mtime = 0;
        return;
    }
    if (st.st_mtime > mfilestat.st_mtime)
    {
        if (st.st_size)
            SysEnv.have_messages = true;
        mfilestat.st_mtime = st.st_mtime;
    }
    
    if (SysEnv.have_messages && !had_messages)
    {
        announce_messages();
        update_message_status();
    }
}
#endif

Insertion in crawl-ref/source/acr.cc at line 2508 [6.4397395]
[22.673]
[13.1272008]
```
#ifdef SIMPLE_MESSAGING
    check_messages();
#endif
```
Insertion in crawl-ref/source/acr.cc at line 2600 [6.4397395]
[13.1274748]
[13.1274748]
```
    case '_': return CMD_READ_MESSAGES;
```

Insertion in crawl-ref/source/AppHdr.h at line 211 [6.4573713]

[19.27977]


    // Basic messaging for dgamelaunch, based on SIMPLE_MAIL for
    // NetHack and Slash'EM. I'm calling this "messaging" because that's
    // closer to reality.
    #define SIMPLE_MESSAGING

Insertion in crawl-ref/source/AppHdr.h at line 217 [6.4573713]

[19.27978]

    // How often we check for messages. This is not once per turn, but once
    // per player-input. Message checks are not performed if the keyboard
    // buffer is full, so messages should not interrupt macros.
    #define MESSAGE_CHECK_INTERVAL 1
    // Record game milestones in an xlogfile.
    #define MILESTONES

Replacement in crawl-ref/source/AppHdr.h at line 382 [6.4573713]

B:BD[6.4588378] → [6.4588378:4588589]

// ===========================================================================
//  Misc
// ===========================================================================
#if HAS_NAMESPACES
    using namespace std;

[6.4588378]

[6.4588589]

#if defined(SIMPLE_MESSAGING) && !defined(USE_FILE_LOCKING)
#   error Must define USE_FILE_LOCKING for SIMPLE_MESSAGING

Merged in crawl.akrasiac.org patches (simple messaging, milestones). These take

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/stuff.cc at line 410 [6.224557]

Replacement in crawl-ref/source/spl-cast.cc at line 1925 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1930 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2329 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2350 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2523 [6.293070]

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

Insertion in crawl-ref/source/player.cc at line 4504 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4949 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4951 [6.962854]

Insertion in crawl-ref/source/output.h at line 18 [6.1087719]

Insertion in crawl-ref/source/output.cc at line 61 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 75 [6.1088282]

Insertion in crawl-ref/source/notes.h at line 60 [13.368326]

Insertion in crawl-ref/source/notes.cc at line 13 [13.370339]

Insertion in crawl-ref/source/notes.cc at line 342 [13.370339]

Replacement in crawl-ref/source/notes.cc at line 349 [13.370339]

Insertion in crawl-ref/source/notes.cc at line 404 [13.370339]

Insertion in crawl-ref/source/notes.cc at line 406 [13.370339]

Replacement in crawl-ref/source/mstuff2.cc at line 1306 [6.1340842]

Insertion in crawl-ref/source/monstuff.cc at line 37 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 40 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 345 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 353 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 384 [6.1396662]

Replacement in crawl-ref/source/monplace.cc at line 860 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 873 [6.1641732]

Insertion in crawl-ref/source/mon-util.cc at line 2556 [6.1699344]

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

Insertion in crawl-ref/source/misc.h at line 171 [6.1928926]

Insertion in crawl-ref/source/misc.cc at line 1943 [6.1933596]

Insertion in crawl-ref/source/items.cc at line 41 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 961 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 969 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 992 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 996 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 1015 [6.2584728]

Insertion in crawl-ref/source/initfile.cc at line 552 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1831 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2375 [6.2957258]

Insertion in crawl-ref/source/hiscores.h at line 43 [6.2986382]

Insertion in crawl-ref/source/hiscores.h at line 120 [6.2986382]

Insertion in crawl-ref/source/hiscores.h at line 154 [6.2986382]

Deletion in crawl-ref/source/hiscores.h at line 157 [6.2986382]

Replacement in crawl-ref/source/hiscores.cc at line 747 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 749 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 750 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 754 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 763 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 774 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 781 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 786 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 793 [6.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 1113 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1117 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1119 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1121 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1124 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1130 [6.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 1134 [6.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1136 [6.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 2086 [6.2987663]

Insertion in crawl-ref/source/files.h at line 96 [6.3082298]

Deletion in crawl-ref/source/files.cc at line 88 [6.3084589]

Replacement in crawl-ref/source/files.cc at line 1523 [6.3084589]

Deletion in crawl-ref/source/files.cc at line 1534 [6.3084589]

Deletion in crawl-ref/source/files.cc at line 1535 [6.3084589]

Deletion in crawl-ref/source/files.cc at line 1536 [6.3084589]

Deletion in crawl-ref/source/files.cc at line 1551 [6.3084589]

Replacement in crawl-ref/source/files.cc at line 1556 [6.3084589]

Replacement in crawl-ref/source/fight.cc at line 1728 [6.3140790]

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

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

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

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

Insertion in crawl-ref/source/externs.h at line 949 [6.3270163]