fiddlerwoaroof/crawl - Change YATODO2EN3AW7IXW5PL25HHK34YHF6Y32QBMOUZXEATZZ4YQQWZQC

Remember choice of Beogh in character selection.

Some code reindenting and housekeeping.

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

Created by dshaligram on June 14, 2007

YATODO2EN3AW7IXW5PL25HHK34YHF6Y32QBMOUZXEATZZ4YQQWZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 725 [4.16817]

B:BD[3.530] → [3.530:583]

               monster->flags |= MF_CONVERT_ATTEMPT;

[3.530]

[3.583]

                monster->flags |= MF_CONVERT_ATTEMPT;

Replacement in crawl-ref/source/view.cc at line 738 [4.16817]

B:BD[3.1106] → [3.1106:1316]

                      snprintf(info, INFO_SIZE, "%s flinches from your weapon.",
                          monster->name(DESC_CAP_THE).c_str());
                      mpr(info);
                      continue;

[3.1106]

[3.1316]

                       snprintf(info, INFO_SIZE, "%s flinches from your weapon.",
                                monster->name(DESC_CAP_THE).c_str());
                       mpr(info);
                       continue;

Replacement in crawl-ref/source/view.cc at line 798 [4.16817]

B:BD[3.4024] → [3.4024:4578]

                   
                   monster->attitude = ATT_HOSTILE;
                   monster->behaviour = BEH_HOSTILE;
                   // CREATED_FRIENDLY stays -> no piety bonus on killing these
                   // give message only sometimes
                   if (player_monster_visible(monster) && random2(4)) 
                   {
                     snprintf(info, INFO_SIZE, "%s deserts you.",
                          monster->name(DESC_CAP_THE).c_str());
                     mpr(info, MSGCH_MONSTER_ENCHANT);
                   }

[3.4024]

[3.4578]

                
                monster->attitude = ATT_HOSTILE;
                monster->behaviour = BEH_HOSTILE;
                // CREATED_FRIENDLY stays -> no piety bonus on killing these
                
                // give message only sometimes
                if (player_monster_visible(monster) && random2(4)) 
                {
                    snprintf(info, INFO_SIZE, "%s deserts you.",
                             monster->name(DESC_CAP_THE).c_str());
                    mpr(info, MSGCH_MONSTER_ENCHANT);
                }

Insertion in crawl-ref/source/religion.h at line 19 [4.800304]
[4.800590]
[5.28665]
```
bool is_priest_god(god_type god);
```

Insertion in crawl-ref/source/religion.cc at line 301 [4.804403]

[6.182]

}
bool is_priest_god(god_type god)
{
    switch (god)
    {
    case GOD_ZIN:
    case GOD_YREDELEMNUL:
    case GOD_BEOGH:
        return (true);
    default:
        return (false);
    }

Insertion in crawl-ref/source/religion.cc at line 770 [4.804403]

[4.818346]

        break;
    case GOD_RANDOM:
        sprintf(godname_buff, "random");

Insertion in crawl-ref/source/religion.cc at line 958 [4.804403]
[3.5805]
[7.528]
```
            break;
```
Deletion in crawl-ref/source/religion.cc at line 1876 [4.804403]
B:BD[3.6621] → [3.6621:6635]
```
             
```

Replacement in crawl-ref/source/religion.cc at line 1879 [4.804403]

B:BD[3.6697] → [3.6697:6799]

∅:D[3.6799] → [4.873483:873484]

B:BD[4.873483] → [4.873483:873484]

B:BD[4.873484] → [3.6800:7193]

          case 0: // smiting (25%)
          case 1:
                 divine_hurt = 10 + random2(10);
                 for (loopy = 0; loopy < 5; loopy++)
                    divine_hurt += random2( you.experience_level );
                    
                 if (!player_under_penance() && you.piety > random2(400))
                 {
                    snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                               "of %s... this time.", god_name(GOD_BEOGH));

[3.6697]

[3.7193]

        case 0: // smiting (25%)
        case 1:
            divine_hurt = 10 + random2(10);
            
            for (loopy = 0; loopy < 5; loopy++)
                divine_hurt += random2( you.experience_level );
            
            if (!player_under_penance() && you.piety > random2(400))
            {
                snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                         "of %s... this time.", god_name(GOD_BEOGH));

Replacement in crawl-ref/source/religion.cc at line 1891 [4.804403]

B:BD[3.7245] → [3.7245:7529]

                 }
                 else
                 {
                    simple_god_message( " smites you!", god );
                    ouch( divine_hurt, 0, KILLED_BY_BEOGH_SMITING );
                    dec_penance( GOD_BEOGH, 1 );
                 }
                 break;

[3.7245]

[3.7529]

            }
            else
            {
                simple_god_message( " smites you!", god );
                ouch( divine_hurt, 0, KILLED_BY_BEOGH_SMITING );
                dec_penance( GOD_BEOGH, 1 );
            }
            break;

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

B:BD[3.7571] → [3.7571:7802]

          case 2: // send out one or two dancing weapons of orc slaying (12.5%)
          {
                // check num of (hostile) orcs around
                int num_wpn = 0;
                for (int i=0 ;i <= random2(2); i++)

[3.7571]

[3.7802]

        case 2: // send out one or two dancing weapons of orc slaying (12.5%)
        {
            // check num of (hostile) orcs around
            int num_wpn = 0;
            for (int i=0 ;i <= random2(2); i++)
            {
                bool created = false;
                
                // first create item
                int it = get_item_slot();
                if (it != NON_ITEM)

Replacement in crawl-ref/source/religion.cc at line 1912 [4.804403]

B:BD[3.7820] → [3.7820:8075]

                   bool created = false;
                   
                   // first create item
                   int it = get_item_slot();
                   if (it != NON_ITEM)
                   {
                      item_def &item = mitm[it];

[3.7820]

[3.8075]

                    item_def &item = mitm[it];
                    
                    item.quantity = 1;
                    item.base_type = OBJ_WEAPONS;
                    // any melee weapon
                    item.sub_type = WPN_CLUB + random2(13); 
                    
                    set_item_ego_type( item, OBJ_WEAPONS, SPWPN_ORC_SLAYING );
                    // just how good should this weapon be?
                    item.plus = random2(3);
                    item.plus2 = random2(3);

Replacement in crawl-ref/source/religion.cc at line 1924 [4.804403]

B:BD[3.8098] → [3.8098:8296]

                      item.quantity = 1;
                      item.base_type = OBJ_WEAPONS;
                      // any melee weapon
                      item.sub_type = WPN_CLUB + random2(13);

[3.8098]

[3.8296]

                    if (coinflip())
                        item.flags |= ISFLAG_CURSED;

Replacement in crawl-ref/source/religion.cc at line 1927 [4.804403]

B:BD[3.8297] → [3.8297:8533]

                      set_item_ego_type( item, OBJ_WEAPONS, SPWPN_ORC_SLAYING );
                      // just how good should this weapon be?
                      item.plus = random2(3);
                      item.plus2 = random2(3);

[3.8297]

[3.8533]

                    set_ident_type( item.base_type, item.sub_type,
                                    ID_KNOWN_TYPE );
                    
                    // for debugging + makes things more interesting
                    // (doesn't seem to have any effect, though)
                    set_ident_flags( item, ISFLAG_KNOW_PLUSES );
                    set_ident_flags( item, ISFLAG_IDENT_MASK );

Replacement in crawl-ref/source/religion.cc at line 1935 [4.804403]

B:BD[3.8534] → [3.8534:9182]

                      if (coinflip())
                         item.flags |= ISFLAG_CURSED;
                      set_ident_type( item.base_type, item.sub_type, ID_KNOWN_TYPE );
                      // for debugging + makes things more interesting
                      // (doesn't seem to have any effect, though)
                      set_ident_flags( item, ISFLAG_KNOW_PLUSES );
                      set_ident_flags( item, ISFLAG_IDENT_MASK );
                      // now create monster
                      int mons = create_monster( MONS_DANCING_WEAPON, 0,
                             BEH_HOSTILE, you.x_pos, you.y_pos, MHITYOU, 250 );

[3.8534]

[3.9182]

                    // now create monster
                    int mons =
                        create_monster( MONS_DANCING_WEAPON, 0,
                                        BEH_HOSTILE, you.x_pos, you.y_pos,
                                        MHITYOU, 250 );

Replacement in crawl-ref/source/religion.cc at line 1941 [4.804403]

B:BD[3.9222] → [3.9222:9730]

                      // hand item information over to monster
                      if (mons != -1 && mons != NON_MONSTER)
                      {
                         mitm[it] = item;
                         mitm[it].quantity = 1;
                         mitm[it].x = 0;
                         mitm[it].y = 0;
                         mitm[it].link = NON_ITEM;
                         menv[mons].inv[MSLOT_WEAPON] = it;
                         created = true;
                         num_wpn++;

[3.9222]

[3.9730]

                    // hand item information over to monster
                    if (mons != -1 && mons != NON_MONSTER)
                    {
                        mitm[it] = item;
                        mitm[it].quantity = 1;
                        mitm[it].x = 0;
                        mitm[it].y = 0;
                        mitm[it].link = NON_ITEM;
                        menv[mons].inv[MSLOT_WEAPON] = it;
                        created = true;
                        num_wpn++;

Replacement in crawl-ref/source/religion.cc at line 1953 [4.804403]

B:BD[3.9731] → [3.9731:9820]

                         if (coinflip()) // 50% chance of weapon disappearing on "death"

[3.9731]

[3.9820]

                        // 50% chance of weapon disappearing on "death"
                        if (coinflip())

Replacement in crawl-ref/source/religion.cc at line 1956 [4.804403]

B:BD[3.9883] → [3.9883:10139]

                      }
                   }
                   if (!created) // didn't work out! delete item
                   {
                      mitm[it].base_type = OBJ_UNASSIGNED;
                      mitm[it].quantity = 0;
                   }

[3.9883]

[3.10139]

Replacement in crawl-ref/source/religion.cc at line 1958 [4.804403]

B:BD[3.10157] → [3.10157:10190]

                if (num_wpn > 0)

[3.10157]

[3.10190]

                if (!created) // didn't work out! delete item

Replacement in crawl-ref/source/religion.cc at line 1960 [4.804403]

B:BD[3.10208] → [3.10208:10550]

                   snprintf(info, INFO_SIZE, " throws %s of orc slaying at you.",
                           num_wpn > 1 ? "implements" : "an implement");
                   simple_god_message(info, god);
                   break;
                } // else fall through
          }
          default: // send orcs after you (5/8)
          {

[3.10208]

[3.10550]

                    mitm[it].base_type = OBJ_UNASSIGNED;
                    mitm[it].quantity = 0;
                }
            }
            if (num_wpn > 0)
            {
                snprintf(info, INFO_SIZE, " throws %s of orc slaying at you.",
                         num_wpn > 1 ? "implements" : "an implement");
                simple_god_message(info, god);
                break;
            } // else fall through
        }
        default: // send orcs after you (5/8)
        {

Replacement in crawl-ref/source/religion.cc at line 1975 [4.804403]

B:BD[3.10551] → [3.10551:10675]

                int points = you.experience_level * 2 + 3
                             + random2(you.experience_level * 3);

[3.10551]

[3.10675]

            int points = you.experience_level * 2 + 3
                + random2(you.experience_level * 3);

Replacement in crawl-ref/source/religion.cc at line 1978 [4.804403]

B:BD[3.10676] → [3.10676:11236]

                // "natural" bands
                if (points >= 30) // min: lvl 6, always: lvl 15
                   punisher = MONS_ORC_HIGH_PRIEST;
                else if (points >= 24) // min: lvl 5, always: lvl 11
                   punisher = MONS_ORC_KNIGHT;
                else if (points >= 18) // min: lvl 4, always: lvl 8
                   punisher = MONS_ORC_WARLORD;
                else if (points >= 12) // min: lvl 2, always: lvl 5
                   punisher = MONS_ORC_WARRIOR;
                else
                   punisher = MONS_ORC;

[3.10676]

[3.11236]

            // "natural" bands
            if (points >= 30) // min: lvl 6, always: lvl 15
                punisher = MONS_ORC_HIGH_PRIEST;
            else if (points >= 24) // min: lvl 5, always: lvl 11
                punisher = MONS_ORC_KNIGHT;
            else if (points >= 18) // min: lvl 4, always: lvl 8
                punisher = MONS_ORC_WARLORD;
            else if (points >= 12) // min: lvl 2, always: lvl 5
                punisher = MONS_ORC_WARRIOR;
            else
                punisher = MONS_ORC;

Replacement in crawl-ref/source/religion.cc at line 1990 [4.804403]

B:BD[3.11237] → [3.11237:11390]

                int mons = create_monster(punisher, 0, BEH_HOSTILE, you.x_pos,
                                          you.y_pos, MHITYOU, 250, true);

[3.11237]

[3.11390]

            int mons = create_monster(punisher, 0, BEH_HOSTILE, you.x_pos,
                                      you.y_pos, MHITYOU, 250, true);

Replacement in crawl-ref/source/religion.cc at line 1993 [4.804403]

B:BD[3.11431] → [3.11431:14792]

                if (mons != -1 && mons != NON_MONSTER)
                    simple_god_message(" sends forth an army of orcs.", god);
                else
                    simple_god_message(" is still gathering forces against you.", god);
/*
                success = false;
                int count = 0;
                int points = 3 + you.experience_level * 3;
                // artificial choice of band members
                while (points > 0 || count <= 1)
                {
                    if (points > 30 && coinflip())
                    {
                        // quick reduction for large values
                        punisher = MONS_ORC_HIGH_PRIEST;
                        points -= 25;
                        break;
                    }
                    else
                    {
                        switch (random2(15))
                        {
                          case 0: //(1/15)
                            punisher = MONS_ORC_SORCERER;
                            points -= 20;
                            break;
                            
                          case 1: //(1/15)
                            punisher = MONS_ORC_WARLORD;
                            points -= 18;
                            break;
                            
                          case 2: //(1/15)
                            punisher = MONS_ORC_KNIGHT;
                            points -= 15;
                            break;
                          case 3:
                          case 4: //(2/15)
                            punisher = MONS_ORC_WARRIOR;
                            points -= 10;
                            break;
                          case 5:
                          case 6:
                          case 7: //(1/5)
                            punisher = MONS_ORC_PRIEST;
                            points -= 7;
                            break;
                          case 8:
                          case 9: //(2/15)
                            punisher = MONS_ORC_WIZARD;
                            punisher -= 5;
                            break;
                          default: //(1/3)
                            punisher = MONS_ORC;
                            points -= 3;
                        }
                    }
                    int mons = create_monster(punisher, 0, BEH_HOSTILE,
                                        you.x_pos, you.y_pos, MHITYOU, 250);
                    if (mons != -1 && mons != NON_MONSTER)
                    {
                        count++;
                        success = true;
                        // just to make sure
                        menv[mons].flags |= MF_CONVERT_ATTEMPT;
                    }
                }
                
                if (success)
                {
                    std::string army_size;
                    if (count > 5)
                      army_size = "an army of";
                    else
                      army_size = "some";
                      
                    snprintf(info, INFO_SIZE, " sends forth %s orcs.", army_size.c_str());
                    simple_god_message(info, god);
                }
                else
                    simple_god_message(" is still gathering forces against you.", god);
*/
          }
          break;

[3.11431]

[3.14792]

            if (mons != -1 && mons != NON_MONSTER)
                simple_god_message(" sends forth an army of orcs.", god);
            else
                simple_god_message(" is still gathering forces against you.",
                                   god);
            break;
        }

Replacement in crawl-ref/source/newgame.cc at line 130 [4.1132300]
B:BD[8.214687] → [8.214687:214719]
```
static int ng_ck, ng_dk, ng_pr;
```
[8.214687]
[8.214719]
```
static int ng_ck, ng_dk;
static god_type ng_pr;
```
Replacement in crawl-ref/source/menu.cc at line 671 [8.261322]
B:BD[9.569773] → [9.569773:569799]
```
    tolower_string(srch);
```
[9.569773]
[9.569799]
```
    lowercase(srch);
```
Replacement in crawl-ref/source/menu.cc at line 676 [8.261322]
B:BD[9.569911] → [9.569911:569941]
```
        tolower_string(text);
```
[9.569911]
[9.569941]
```
        lowercase(text);
```

Replacement in crawl-ref/source/libutil.h at line 30 [4.2493627]

∅:D[10.734] → [9.619313:619377]

B:BD[9.619313] → [9.619313:619377]

void lowercase(std::string &s);
void uppercase(std::string &s);

[10.734]

[2.3412]

std::string lowercase_string(std::string s);
std::string &lowercase(std::string &s);
std::string &uppercase(std::string &s);

Replacement in crawl-ref/source/libutil.cc at line 183 [4.2494093]
∅:D[11.144263] → [9.621753:621784]
B:BD[9.621753] → [9.621753:621784]
```
void uppercase(std::string &s)
```
[11.144263]
[9.621784]
```
std::string &uppercase(std::string &s)
```

Replacement in crawl-ref/source/libutil.cc at line 185 [4.2494093]

B:BD[9.621786] → [9.621786:621904]

    /* yes, this is bad, but std::transform() has its own problems */
    for (unsigned int i = 0; i < s.size(); ++i)

[9.621786]

[9.621904]

    for (unsigned i = 0, sz = s.size(); i < sz; ++i)

Insertion in crawl-ref/source/libutil.cc at line 187 [4.2494093]
[9.621934]
[9.621934]
```
    return (s);
```
Replacement in crawl-ref/source/libutil.cc at line 190 [4.2494093]
B:BD[9.621937] → [9.621937:621968]
```
void lowercase(std::string &s)
```
[9.621937]
[9.621968]
```
std::string &lowercase(std::string &s)
```
Replacement in crawl-ref/source/libutil.cc at line 192 [4.2494093]
B:BD[9.621970] → [9.621970:622018]
```
    for (unsigned int i = 0; i < s.size(); ++i)
```
[9.621970]
[9.622018]
```
    for (unsigned i = 0, sz = s.size(); i < sz; ++i)
```
Insertion in crawl-ref/source/libutil.cc at line 194 [4.2494093]
[9.622048]
[2.3654]
```
    return (s);
```

Insertion in crawl-ref/source/libutil.cc at line 197 [4.2494093]

[2.3657]

std::string lowercase_string(std::string s)
{
    lowercase(s);
    return (s);
}

Replacement in crawl-ref/source/libutil.cc at line 471 [4.2494093]
B:BD[8.331452] → [8.331452:331498]
```
std::string & trim_string( std::string &str )
```
[8.331452]
[8.331498]
```
std::string &trim_string( std::string &str )
```
Insertion in crawl-ref/source/initfile.h at line 19 [4.2956146]
[8.389563]
[4.2956428]
```
#include "enum.h"
```
Replacement in crawl-ref/source/initfile.h at line 22 [4.2956146]
B:BD[4.2956429] → [4.2956429:2956476]
B:BD[4.2956476] → [9.784796:784846]
```
std::string & trim_string( std::string &str );
std::string & tolower_string( std::string &str );
```
[4.2956429]
[9.784846]
```
god_type str_to_god(std::string god);
```
Insertion in crawl-ref/source/initfile.cc at line 34 [4.2957258]
[4.2957837]
[8.391050]
```
#include "religion.h"
```
Deletion in crawl-ref/source/initfile.cc at line 43 [4.2957258]
∅:D[9.785141] → [4.2958225:2958226]
B:BD[4.2958225] → [4.2958225:2958226]
B:BD[4.2958226] → [9.785142:785191]
```
std::string &tolower_string( std::string &str );
```

Insertion in crawl-ref/source/initfile.cc at line 52 [4.2957258]

[8.391347]

[12.14719]

}
god_type str_to_god(std::string god)
{
    if (god.empty())
        return (GOD_NO_GOD);
    lowercase(god);
    
    if (god == "random")
        return (GOD_RANDOM);
    
    for (int i = GOD_NO_GOD; i < NUM_GODS; ++i)
    {
        if (lowercase_string(god_name(static_cast<god_type>(i))) == god)
            return (static_cast<god_type>(i));
    }
    return (GOD_NO_GOD);

Deletion in crawl-ref/source/initfile.cc at line 326 [4.2957258]

B:BD[4.2963642] → [9.786945:786994]

∅:D[9.786994] → [4.2963698:2963888]

B:BD[4.2963698] → [4.2963698:2963888]

std::string & tolower_string( std::string &str )
{
    if (str.length()) 
    {
        for (std::string::iterator cp = str.begin(); cp != str.end(); cp++) 
        {
            *cp = tolower( *cp );
        }
    }
    return (str);
}

Replacement in crawl-ref/source/initfile.cc at line 1012 [4.2957258]
B:BD[8.398983] → [8.398983:399022]
```
    if (Options.prev_pr != GOD_NO_GOD)
```
[8.398983]
[8.399022]
```
    if (is_priest_god(Options.prev_pr) || Options.prev_pr == GOD_RANDOM)
```

Replacement in crawl-ref/source/initfile.cc at line 1015 [4.2957258]

B:BD[8.399064] → [8.399064:399239]

                Options.prev_pr == GOD_ZIN? "zin" :
                Options.prev_pr == GOD_YREDELEMNUL? "yredelemnul" :
                                            "random");

[8.399064]

[9.797727]

                lowercase_string(god_name(Options.prev_pr)).c_str());

Replacement in crawl-ref/source/initfile.cc at line 1398 [4.2957258]
B:BD[13.1665] → [13.1665:1707]
∅:D[13.1707] → [8.405064:405109]
∅:D[9.798689] → [8.405064:405109]
B:BD[8.405064] → [8.405064:405109]
```
    tolower_string( trim_string( key ) );
    tolower_string( trim_string( subkey ) );
```
[13.1665]
[8.405109]
```
    lowercase( trim_string( key ) );
    lowercase( trim_string( subkey ) );
```
Replacement in crawl-ref/source/initfile.cc at line 1420 [4.2957258]
B:BD[8.405502] → [8.405502:405535]
```
        tolower_string( field );
```
[8.405502]
[8.405535]
```
        lowercase( field );
```
Replacement in crawl-ref/source/initfile.cc at line 1739 [4.2957258]
B:BD[8.413215] → [8.413215:413243]
B:BD[8.413243] → [9.802930:802960]
∅:D[9.802960] → [8.413281:413322]
B:BD[8.413281] → [8.413281:413322]
B:BD[8.413322] → [9.802961:802999]
∅:D[9.802999] → [8.413368:413404]
B:BD[8.413368] → [8.413368:413404]
```
        if (field == "zin")
            priest = GOD_ZIN;
        else if (field == "yredelemnul")
            priest = GOD_YREDELEMNUL;
        else if (field == "random")
```
[8.413215]
[9.803000]
```
        priest = str_to_god(field);
        if (!is_priest_god(priest))
```
Replacement in crawl-ref/source/initfile.cc at line 2808 [4.2957258]
B:BD[9.813504] → [9.813504:813529]
```
    tolower_string(val);
```
[9.813504]
[9.813529]
```
    lowercase(val);
```
Insertion in crawl-ref/source/hiscores.cc at line 41 [4.2987663]
[4.2988596]
[4.2988596]
```
#include "initfile.h"
```
Deletion in crawl-ref/source/hiscores.cc at line 653 [4.2987663]
B:BD[14.12845] → [14.12845:12847]
∅:D[14.12847] → [9.819853:819854]
B:BD[9.819853] → [9.819853:819854]
B:BD[9.819854] → [5.51899:51950]
∅:D[5.51950] → [14.12894:13003]
B:BD[14.12894] → [14.12894:13003]
B:BD[14.13003] → [5.51951:52053]
∅:D[14.13059] → [4.3039267:3039273]
∅:D[5.52053] → [4.3039267:3039273]
∅:D[9.820006] → [4.3039267:3039273]
B:BD[4.3039267] → [4.3039267:3039273]
B:BD[4.3039273] → [14.13060:13085]
```
}
static god_type str_to_god(const std::string &god)
{
    if (god.empty())
        return GOD_NO_GOD;
    
    for (int i = GOD_NO_GOD; i < NUM_GODS; ++i)
    {
        if (god_name(static_cast<god_type>(i)) == god)
            return (static_cast<god_type>(i));
    }
    return (GOD_NO_GOD);
```

Replacement in crawl-ref/source/fight.cc at line 1005 [4.3140790]

B:BD[3.20387] → [3.20387:20439]

            {
              damage++;
            }

[3.20387]

[3.20439]

                damage++;

Replacement in crawl-ref/source/fight.cc at line 1008 [4.3140790]
∅:D[3.20482] → [15.47239:47271]
B:BD[15.47239] → [15.47239:47271]
```
        {
            damage++;
```
[3.20482]
[15.47271]
```
                damage++;
```
Deletion in crawl-ref/source/fight.cc at line 1011 [4.3140790]
∅:D[3.20489] → [15.47281:47287]
B:BD[15.47281] → [15.47281:47287]
```
    }
```

Replacement in crawl-ref/source/externs.h at line 1500 [4.3270163]

B:BD[4.3284425] → [4.3284425:3284497]

    int         priest;         // choice of god for priests (Zin/Yred)

[4.3284425]

[4.3284497]

    god_type    priest;         // choice of god for priests (Zin/Yred)

Replacement in crawl-ref/source/externs.h at line 1662 [4.3270163]
B:BD[8.447292] → [8.447292:447335]
```
    int         prev_ck, prev_dk, prev_pr;
```
[8.447292]
[8.447335]
```
    int         prev_ck, prev_dk;
    god_type    prev_pr;
```

Remember choice of Beogh in character selection.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 725 [4.16817]

Replacement in crawl-ref/source/view.cc at line 738 [4.16817]

Replacement in crawl-ref/source/view.cc at line 798 [4.16817]

Insertion in crawl-ref/source/religion.h at line 19 [4.800304]

Insertion in crawl-ref/source/religion.cc at line 301 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 770 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 958 [4.804403]

Deletion in crawl-ref/source/religion.cc at line 1876 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1879 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1891 [4.804403]

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

Replacement in crawl-ref/source/religion.cc at line 1912 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1924 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1927 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1935 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1941 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1953 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1956 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1958 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1960 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1975 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1978 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1990 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 1993 [4.804403]

Replacement in crawl-ref/source/newgame.cc at line 130 [4.1132300]

Replacement in crawl-ref/source/menu.cc at line 671 [8.261322]

Replacement in crawl-ref/source/menu.cc at line 676 [8.261322]

Replacement in crawl-ref/source/libutil.h at line 30 [4.2493627]

Replacement in crawl-ref/source/libutil.cc at line 183 [4.2494093]

Replacement in crawl-ref/source/libutil.cc at line 185 [4.2494093]

Insertion in crawl-ref/source/libutil.cc at line 187 [4.2494093]

Replacement in crawl-ref/source/libutil.cc at line 190 [4.2494093]

Replacement in crawl-ref/source/libutil.cc at line 192 [4.2494093]

Insertion in crawl-ref/source/libutil.cc at line 194 [4.2494093]

Insertion in crawl-ref/source/libutil.cc at line 197 [4.2494093]

Replacement in crawl-ref/source/libutil.cc at line 471 [4.2494093]

Insertion in crawl-ref/source/initfile.h at line 19 [4.2956146]

Replacement in crawl-ref/source/initfile.h at line 22 [4.2956146]

Insertion in crawl-ref/source/initfile.cc at line 34 [4.2957258]

Deletion in crawl-ref/source/initfile.cc at line 43 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 52 [4.2957258]

Deletion in crawl-ref/source/initfile.cc at line 326 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1012 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1015 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1398 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1420 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1739 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2808 [4.2957258]

Insertion in crawl-ref/source/hiscores.cc at line 41 [4.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 653 [4.2987663]

Replacement in crawl-ref/source/fight.cc at line 1005 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1008 [4.3140790]

Deletion in crawl-ref/source/fight.cc at line 1011 [4.3140790]

Replacement in crawl-ref/source/externs.h at line 1500 [4.3270163]

Replacement in crawl-ref/source/externs.h at line 1662 [4.3270163]