fiddlerwoaroof/crawl - Change 4O3VTUJT5T7NBNF3Q45XO2WHS6TCJXVLH6CKX4K36WUBDRT5F6KAC

Minor cleanups.

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

Created by haranp on July 17, 2007

4O3VTUJT5T7NBNF3Q45XO2WHS6TCJXVLH6CKX4K36WUBDRT5F6KAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 2472 [5.804403]

[4.346]


static bool god_likes_items(god_type god)
{
    switch (god)
    {
    case GOD_ZIN:      case GOD_KIKUBAAQUDGHA: case GOD_OKAWARU:
    case GOD_MAKHLEB:  case GOD_SIF_MUNA:      case GOD_TROG:
    case GOD_NEMELEX_XOBEH:                    case GOD_ELYVILON:
        return true;
        
    case GOD_SHINING_ONE: case GOD_YREDELEMNUL: case GOD_XOM:
    case GOD_VEHUMET:     case GOD_LUGONU:      case GOD_BEOGH:
        return false;
    case GOD_NO_GOD: case NUM_GODS: case GOD_RANDOM:
        mprf("Bad god, no biscuit! %d", static_cast<int>(god) );
        return false;
    }
    return false;
}

Insertion in crawl-ref/source/religion.cc at line 2493 [5.804403]

[4.347]

static bool god_likes_item(god_type god, const item_def& item)
{
    if ( !god_likes_items(god) )
        return false;
    switch (god)
    {
    case GOD_ELYVILON:
        return
            item.base_type == OBJ_WEAPONS ||
            item.base_type == OBJ_MISSILES;
    case GOD_KIKUBAAQUDGHA: case GOD_TROG:
        return item.base_type == OBJ_CORPSES;
    default:
        return true;
    }
}

Replacement in crawl-ref/source/religion.cc at line 2515 [5.804403]

B:BD[4.368] → [4.368:404]

    if (you.religion == GOD_NO_GOD)

[4.368]

[4.404]

    if (you.religion == GOD_NO_GOD || !god_likes_items(you.religion))

Replacement in crawl-ref/source/religion.cc at line 2521 [5.804403]

B:BD[5.879917] → [5.879917:879969]

        if (one_chance_in(1000))
            break;

[5.879917]

[5.879969]

        const int next = mitm[i].link;  // in case we can't get it later.
        const int value = item_value( mitm[i], true );

Replacement in crawl-ref/source/religion.cc at line 2524 [5.804403]

B:BD[5.879970] → [4.539:613]

        const int next = mitm[i].link;  // in case we can't get it later.

[5.879970]

[5.880034]

        if (!god_likes_item(you.religion, mitm[i]))
        {
            i = next;
            continue;
        }

Replacement in crawl-ref/source/religion.cc at line 2530 [5.804403]

B:BD[5.880035] → [6.3780:3835]

        const int value = item_value( mitm[i], true );

[5.880035]

[5.880100]

        msg::streams(MSGCH_GOD) << mitm[i].name(DESC_CAP_THE)
                                << sacrifice_message(you.religion, mitm[i])
                                << std::endl;

Replacement in crawl-ref/source/religion.cc at line 2537 [5.804403]
B:BD[2.1613] → [2.1613:1614]
[2.1613]
[5.880101]
```
        
```

Replacement in crawl-ref/source/religion.cc at line 2542 [5.804403]

B:BD[2.1708] → [2.1708:1803]

            if ( you.attribute[ATTR_CARD_COUNTDOWN] &&
                 random2(800) < value )

[2.1708]

[2.1803]

            if (you.attribute[ATTR_CARD_COUNTDOWN] && random2(800) < value)

Deletion in crawl-ref/source/religion.cc at line 2550 [5.804403]

B:BD[2.2039] → [2.2039:2180]


            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),
                 sacrifice_message(you.religion, mitm[i]).c_str());

Deletion in crawl-ref/source/religion.cc at line 2556 [5.804403]
B:BD[2.2408] → [2.2408:2437]
```
            destroy_item(i);
```

Deletion in crawl-ref/source/religion.cc at line 2561 [5.804403]

B:BD[5.880247] → [7.321:393]

∅:D[7.393] → [8.1290:1358]

B:BD[9.2503] → [8.1290:1358]

            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),
                 sacrifice_message(you.religion, mitm[i]).c_str());

Deletion in crawl-ref/source/religion.cc at line 2567 [5.804403]
B:BD[5.880602] → [5.880602:880632]
```
            destroy_item(i);
```
Deletion in crawl-ref/source/religion.cc at line 2570 [5.804403]
B:BD[5.880679] → [7.394:466]
∅:D[7.466] → [8.1359:1427]
B:BD[9.2612] → [8.1359:1427]
∅:D[4.777] → [5.880841:880842]
∅:D[8.1427] → [5.880841:880842]
∅:D[9.2659] → [5.880841:880842]
B:BD[5.880841] → [5.880841:880842]
```
            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),
                 sacrifice_message(you.religion, mitm[i]).c_str());
```
Deletion in crawl-ref/source/religion.cc at line 2572 [5.804403]
B:BD[5.880916] → [5.880916:880946]
```
            destroy_item(i);
```
Deletion in crawl-ref/source/religion.cc at line 2576 [5.804403]
B:BD[5.881021] → [5.881021:881095]
B:BD[5.881095] → [7.467:539]
∅:D[7.539] → [8.1428:1496]
B:BD[9.2721] → [8.1428:1496]
∅:D[4.859] → [5.881257:881258]
∅:D[8.1496] → [5.881257:881258]
∅:D[9.2768] → [5.881257:881258]
B:BD[5.881257] → [5.881257:881258]
```
            if (mitm[i].base_type != OBJ_CORPSES)
                break;
            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),
                 sacrifice_message(you.religion, mitm[i]).c_str());
```
Deletion in crawl-ref/source/religion.cc at line 2577 [5.804403]
B:BD[5.881285] → [5.881285:881314]
```
            destroy_item(i);
```

Deletion in crawl-ref/source/religion.cc at line 2580 [5.804403]

B:BD[5.881361] → [5.881361:881516]

B:BD[5.881516] → [7.540:612]

∅:D[7.612] → [8.1497:1565]

B:BD[9.2830] → [8.1497:1565]

∅:D[4.941] → [5.881678:881679]

∅:D[8.1565] → [5.881678:881679]

∅:D[9.2877] → [5.881678:881679]

B:BD[5.881678] → [5.881678:881679]

            if (mitm[i].base_type != OBJ_WEAPONS
                && mitm[i].base_type != OBJ_MISSILES)
            {
                break;
            }
            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),
                 sacrifice_message(you.religion, mitm[i]).c_str());

Deletion in crawl-ref/source/religion.cc at line 2586 [5.804403]
B:BD[5.881907] → [5.881907:881937]
```
            destroy_item(i);
```
Insertion in crawl-ref/source/religion.cc at line 2592 [5.804403]
[5.882004]
[5.882004]
```
        destroy_item(i);
```

Replacement in crawl-ref/source/religion.cc at line 2605 [5.804403]

B:BD[5.882409] → [5.882409:882530]

B:BD[5.882530] → [10.17318:17427]

    if ((you.is_undead || you.species == SP_DEMONSPAWN)
        && (which_god == GOD_ZIN || which_god == GOD_SHINING_ONE
            || which_god == GOD_ELYVILON) ||
          which_god == GOD_BEOGH && you.species != SP_HILL_ORC)

[5.882409]

[5.882573]

    // Gods can be racist...
    const bool you_evil = you.is_undead || you.species == SP_DEMONSPAWN;
    if ( (you_evil && is_good_god(which_god)) ||
         (you.species != SP_HILL_ORC && which_god == GOD_BEOGH) )

Replacement in crawl-ref/source/religion.cc at line 2627 [5.804403]
B:BD[5.882889] → [5.882889:882913]
```
    if (!yesno( info ))
```
[5.882889]
[5.882913]
```
    if (!yesno( info ) || !yesno("Are you sure?"))
```

Replacement in crawl-ref/source/religion.cc at line 2633 [5.804403]

B:BD[5.882967] → [5.882967:883053]

    if (!yesno("Are you sure?"))
    {
        redraw_screen();
        return;
    }

[5.882967]

[5.883053]

    // OK, so join the new religion.

Insertion in crawl-ref/source/religion.cc at line 2636 [5.804403]
[5.883075]
[5.883075]
```
    // Leave your prior religion first.
```
Replacement in crawl-ref/source/religion.cc at line 2641 [5.804403]
B:BD[5.883139] → [11.952:1005]
```
    //jmf: moved up so god_speaks gives right colour
```
[5.883139]
[11.1005]
```
    // Welcome to the fold!
```

Replacement in crawl-ref/source/religion.cc at line 2681 [5.804403]

B:BD[5.884145] → [5.884145:884234]

            god_speaks(GOD_SHINING_ONE, "\"You will pay for your evil ways, mortal!\"");

[5.884145]

[5.884234]

            god_speaks(GOD_SHINING_ONE,
                       "\"You will pay for your evil ways, mortal!\"");

Replacement in crawl-ref/source/religion.cc at line 2686 [5.804403]
B:BD[12.3785] → [13.867:905]
```
    if ( you.religion == GOD_LUGONU )
```
[12.3785]
[12.3821]
```
    if ( you.religion == GOD_LUGONU && !you.worshipped[GOD_LUGONU] )
```

Replacement in crawl-ref/source/newgame.cc at line 712 [5.1132300]

B:BD[5.1147223] → [14.7763:7954]

∅:D[14.7954] → [5.1148631:1148632]

B:BD[5.1148631] → [5.1148631:1148632]

            textcolor( BROWN );
            cprintf( EOL "Welcome back, " );
            textcolor( YELLOW );
            cprintf( "%s!", you.your_name );
            textcolor( LIGHTGREY );

[5.1147223]

[14.7955]

            // Seems sort of pointless to print this, since the
            // game start will kill overwrite it immediately...
            formatted_string::parse_string(
                "EOL<brown>Welcome back, <yellow>" +
                std::string(you.your_name) + "!<lightgrey>").display();

Deletion in crawl-ref/source/newgame.cc at line 2026 [5.1132300]

B:BD[5.1182578] → [5.1182578:1182857]


/* ************************************************************************
// MAKE INTO FUNCTION!!! {dlb}
// randomly boost stats a number of times based on species {dlb}
    unsigned char points_left = ( you.species == SP_DEMIGOD || you.species == SP_DEMONSPAWN ) ? 15 : 8;

Deletion in crawl-ref/source/newgame.cc at line 2027 [5.1132300]

B:BD[5.1182858] → [5.1182858:1183511]

    do
    {
        switch ( random2(NUM_STATS) )
        {
          case STAT_STRENGTH:
            if ( you.strength > 17 && coinflip() )
              continue;
            you.strength++;
            break;
          case STAT_DEXTERITY:
            if ( you.dex > 17 && coinflip() )
              continue;
            you.dex++;
            break;
          case STAT_INTELLIGENCE:
            if ( you.intel > 17 && coinflip() )
              continue;
            you.intel++;
            break;
        }
        points_left--;
    }
    while (points_left > 0);
************************************************************************ */

Replacement in crawl-ref/source/newgame.cc at line 2030 [5.1132300]

B:BD[5.1183991] → [5.1183991:1184016]

B:BD[5.1184016] → [15.386118:386175]

∅:D[15.386175] → [5.1184077:1184101]

B:BD[5.1184077] → [5.1184077:1184101]

B:BD[5.1184101] → [16.1516:1600]

∅:D[16.1600] → [15.386176:386193]

B:BD[5.1184160] → [15.386176:386193]

    textcolor( YELLOW );
    cprintf("Hello, welcome to " CRAWL " " VERSION "!");
    textcolor( BROWN );
    cprintf(EOL "(c) Copyright 1997-2002 Linley Henzell, 2002-2007 Crawl DevTeam");
    cprintf(EOL

[5.1183595]

[15.386193]

    std::string msg =
        "<yellow>Hello, welcome to " CRAWL " " VERSION "!</yellow>" EOL
        "<brown>(c) Copyright 1997-2002 Linley Henzell, "
        "2002-2007 Crawl DevTeam" EOL

Replacement in crawl-ref/source/newgame.cc at line 2035 [5.1132300]
B:BD[15.386271] → [15.386271:386285]
```
        EOL);
```
[15.386271]
[15.386285]
```
        "</brown>" EOL;
```

Replacement in crawl-ref/source/newgame.cc at line 2037 [5.1132300]

B:BD[15.386286] → [15.386286:386367]

    bool init_found = init_file_location.find("not found") == std::string::npos;

[15.386286]

[15.386367]

    const bool init_found =
        (init_file_location.find("not found") == std::string::npos);

Replacement in crawl-ref/source/newgame.cc at line 2041 [5.1132300]
B:BD[15.386388] → [15.386388:386419]
```
        textcolor( LIGHTRED );
```
[15.386388]
[15.386419]
```
        msg += "<lightred>Init file ";
```
Replacement in crawl-ref/source/newgame.cc at line 2043 [5.1132300]
B:BD[15.386428] → [15.386428:386460]
```
        textcolor( LIGHTGREY );
```
[15.386428]
[15.386460]
```
        msg += "<lightgrey>Init file read: ";
```

Replacement in crawl-ref/source/newgame.cc at line 2045 [5.1132300]

B:BD[15.386461] → [15.386461:386575]

    cprintf("Init file %s%s" EOL,
            init_found? "read: " : "",
            init_file_location.c_str());

[15.386461]

[5.1184257]

    msg += init_file_location;
    msg += EOL;
    
    formatted_string::parse_string(msg).display();

Deletion in crawl-ref/source/newgame.cc at line 2050 [5.1132300]
B:BD[5.1184285] → [5.1184285:1184286]
Replacement in crawl-ref/source/newgame.cc at line 2051 [5.1132300]
B:BD[5.1184298] → [5.1184298:1184353]
```
}                               // end openingScreen()
```
[5.1184298]
[15.386576]
```
}
```

Replacement in crawl-ref/source/newgame.cc at line 2204 [5.1132300]

B:BD[17.40853] → [18.232:347]

∅:D[18.347] → [17.40942:41109]

B:BD[17.40942] → [17.40942:41109]

B:BD[17.41109] → [18.348:390]

∅:D[18.390] → [17.41149:41184]

B:BD[17.41149] → [17.41149:41184]

             cprintf("  If you've never been here before, "
                     "you might want to try out" EOL);
             cprintf("  the Dungeon Crawl tutorial. To do this, press ");
             textcolor(WHITE);
             cprintf("T");
             textcolor(LIGHTGREY);
             cprintf(" on the next" EOL);
             cprintf("  screen.");

[17.40853]

[17.41184]

             formatted_string::parse_string(
                 "  If you've never been here before, you might want to try "
                 "out" EOL "  the Dungeon Crawl tutorial. To do this, press "
                 "<white>T</white> on the next" EOL "  screen.").display();

Replacement in crawl-ref/source/newgame.cc at line 2216 [5.1132300]

B:BD[15.390604] → [15.390604:390665]

            if ((int) desc.length() >= get_number_of_cols())

[15.390604]

[15.390665]

            if (static_cast<int>(desc.length()) >= get_number_of_cols())

Replacement in crawl-ref/source/newgame.cc at line 2467 [5.1132300]
B:BD[5.1193290] → [19.236:287]
```
static void make_rod(item_def &item, int rod_type)
```
[5.1193290]
[19.287]
```
static void make_rod(item_def &item, stave_type rod_type)
```
Deletion in crawl-ref/source/newgame.cc at line 4875 [5.1132300]
B:BD[3.9854] → [3.9854:9860]
```
    {
```
Deletion in crawl-ref/source/newgame.cc at line 4876 [5.1132300]
B:BD[3.9903] → [3.9903:9909]
```
    }
```

Replacement in crawl-ref/source/newgame.cc at line 4878 [5.1132300]

B:BD[5.1260146] → [5.1260146:1260227]

        you.skills[weapon_skill(OBJ_WEAPONS, you.inv[0].sub_type)] = weap_skill;

[5.1260146]

[5.1260227]

        you.skills[weapon_skill(OBJ_WEAPONS, you.inv[0].sub_type)]=weap_skill;

Deletion in crawl-ref/source/acr.cc at line 146 [5.4397395]
∅:D[15.1255466] → [5.4401180:4401201]
B:BD[5.4401180] → [5.4401180:4401201]
```
char use_colour = 1;
```

Replacement in crawl-ref/source/acr.cc at line 2840 [5.4397395]

B:BD[5.4470627] → [5.4470627:4470836]

    you.redraw_strength = 1;
    you.redraw_intelligence = 1;
    you.redraw_dexterity = 1;
    you.redraw_armour_class = 1;
    you.redraw_evasion = 1;
    you.redraw_experience = 1;
    you.redraw_gold = 1;

[5.4470627]

[5.4470836]

    you.redraw_strength = true;
    you.redraw_intelligence = true;
    you.redraw_dexterity = true;
    you.redraw_armour_class = true;
    you.redraw_evasion = true;
    you.redraw_experience = true;
    you.redraw_gold = true;

Minor cleanups.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 2472 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 2493 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2515 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2521 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2524 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2530 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2537 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2542 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2550 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2556 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2561 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2567 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2570 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2572 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2576 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2577 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2580 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 2586 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 2592 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2605 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2627 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2633 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 2636 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2641 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2681 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2686 [5.804403]

Replacement in crawl-ref/source/newgame.cc at line 712 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2026 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2027 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2030 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2035 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2037 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2041 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2043 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2045 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2050 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2051 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2204 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2216 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2467 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4875 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4876 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4878 [5.1132300]

Deletion in crawl-ref/source/acr.cc at line 146 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 2840 [5.4397395]