fiddlerwoaroof/crawl - Change N6F35CMZALDQR4LD3HP2JQZGQ4JNBATAICO7ZUCF5M2ZW5E4QYVAC

Add more minor cosmetic fixes.

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

Created by dolorous on January 1, 2009

N6F35CMZALDQR4LD3HP2JQZGQ4JNBATAICO7ZUCF5M2ZW5E4QYVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1043 [5.436250]
B:BD[5.478540] → [6.9647:9694]
```
    for ( stack_iterator si(where); si; ++si )
```
[5.478540]
[5.478652]
```
    for (stack_iterator si(where); si; ++si)
```

Replacement in crawl-ref/source/spells4.cc at line 1045 [5.436250]

B:BD[5.478658] → [7.8906:8991]

        if (si->base_type == OBJ_CORPSES
            && si->sub_type == CORPSE_BODY)

[5.478658]

[5.478787]

        if (si->base_type == OBJ_CORPSES && si->sub_type == CORPSE_BODY)

Insertion in crawl-ref/source/spells4.cc at line 1047 [5.436250]
[5.478797]
[7.8992]
```
            // Found a corpse.  Skeletonise it if possible.
```

Replacement in crawl-ref/source/spells4.cc at line 1054 [5.436250]

∅:D[7.9174] → [5.479104:479171]

∅:D[6.9733] → [5.479104:479171]

B:BD[5.479104] → [5.479104:479171]

B:BD[5.479171] → [8.3822:3866]

                        (3 + random2(pow / 4) + random2(pow / 4) +
                         random2(pow / 4)),

[6.9733]

[8.3866]

                        (3 + random2(pow / 4) + random2(pow / 4)
                           + random2(pow / 4)),

Replacement in crawl-ref/source/spells4.cc at line 1057 [5.436250]
∅:D[8.3899] → [5.479216:479238]
B:BD[5.479216] → [5.479216:479238]
```
            return 1;
```
[8.3899]
[5.479238]
```
            return (1);
```
Replacement in crawl-ref/source/spells4.cc at line 1061 [5.436250]
B:BD[5.479276] → [5.479276:479290]
```
    return 0;
```
[5.479276]
[9.5409]
```
    return (0);
```

Replacement in crawl-ref/source/spells2.cc at line 238 [5.569242]

B:BD[5.574344] → [4.275:342]

                    // Found a corpse. Skeletonise it if possible.

[5.574344]

[10.1118]

                    // Found a corpse.  Skeletonise it if possible.

Replacement in crawl-ref/source/misc.h at line 27 [5.1928926]

B:BD[5.1932186] → [11.6141:6207]

∅:D[11.6207] → [5.1932186:1932234]

B:BD[5.1932186] → [5.1932186:1932234]

void turn_corpse_into_skeleton(item_def &corpse, int time = 200);
void turn_corpse_into_chunks( item_def &item );

[12.128]

[13.9931]

void turn_corpse_into_skeleton(item_def &item, int time = 200);
void turn_corpse_into_chunks(item_def &item);

Replacement in crawl-ref/source/misc.cc at line 83 [5.1933596]
B:BD[14.5376] → [14.5376:5424]
```
static void create_monster_hide(int mons_class)
```
[14.5376]
[14.5424]
```
static void _create_monster_hide(int mons_class)
```
Deletion in crawl-ref/source/misc.cc at line 89 [5.1933596]
B:BD[14.5515] → [14.5515:5541]
∅:D[15.1484] → [5.1934810:1934811]
∅:D[14.5541] → [5.1934810:1934811]
∅:D[16.9070] → [5.1934810:1934811]
B:BD[5.1934810] → [5.1934810:1934811]
```
    mitm[o].quantity = 1;
```
Insertion in crawl-ref/source/misc.cc at line 91 [5.1933596]
[14.5623]
[14.5623]
```
    mitm[o].quantity  = 1;
```

Replacement in crawl-ref/source/misc.cc at line 96 [5.1933596]

B:BD[14.5731] → [14.5731:5788]

    mitm[o].colour    = mons_class_colour( mons_class );

[14.5731]

[14.5788]

    mitm[o].colour    = mons_class_colour(mons_class);

Replacement in crawl-ref/source/misc.cc at line 132 [5.1933596]
B:BD[14.6721] → [7.36644:36684]
```
    move_item_to_grid( &o, you.pos() );
```
[14.6721]
[11.6209]
```
    move_item_to_grid(&o, you.pos());
```

Replacement in crawl-ref/source/misc.cc at line 138 [5.1933596]

B:BD[11.6404] → [11.6404:6463]

void turn_corpse_into_skeleton(item_def &corpse, int time)

[11.6404]

[11.6463]

void turn_corpse_into_skeleton(item_def &item, int time)

Replacement in crawl-ref/source/misc.cc at line 140 [5.1933596]

B:BD[11.6465] → [11.6465:6544]

    ASSERT(corpse.base_type == OBJ_CORPSES && corpse.sub_type == CORPSE_BODY);

[11.6465]

[11.6544]

    ASSERT(item.base_type == OBJ_CORPSES && item.sub_type == CORPSE_BODY);

Replacement in crawl-ref/source/misc.cc at line 143 [5.1933596]
B:BD[11.6621] → [2.2483:2520]
```
    if (!mons_skeleton(corpse.plus))
```
[11.6621]
[11.6660]
```
    if (!mons_skeleton(item.plus))
```

Replacement in crawl-ref/source/misc.cc at line 148 [5.1933596]

B:BD[11.6795] → [11.6795:6931]

B:BD[11.6931] → [3.3053:3059]

    if (mons_genus(corpse.plus) == MONS_DRACONIAN
        && corpse.plus != MONS_DRACONIAN)
    {
        corpse.plus = MONS_DRACONIAN;
    }

[11.6795]

[3.3059]

    if (mons_genus(item.plus) == MONS_DRACONIAN && item.plus != MONS_DRACONIAN)
        item.plus = MONS_DRACONIAN;

Replacement in crawl-ref/source/misc.cc at line 151 [5.1933596]

B:BD[3.3097] → [3.3097:3220]

∅:D[3.3220] → [11.6931:6937]

B:BD[11.6931] → [11.6931:6937]

    else if (mons_genus(corpse.plus) == MONS_RAT
        && corpse.plus != MONS_RAT)
    {
        corpse.plus = MONS_RAT;
    }

[3.3097]

[11.6937]

    else if (mons_genus(item.plus) == MONS_RAT && item.plus != MONS_RAT)
        item.plus = MONS_RAT;

Replacement in crawl-ref/source/misc.cc at line 154 [5.1933596]

B:BD[11.6938] → [11.6938:7038]

    corpse.sub_type = CORPSE_SKELETON;
    corpse.special  = time;
    corpse.colour   = LIGHTGREY;

[11.6938]

[14.6772]

    item.sub_type = CORPSE_SKELETON;
    item.special  = time;
    item.colour   = LIGHTGREY;

Replacement in crawl-ref/source/misc.cc at line 159 [5.1933596]
∅:D[14.6775] → [5.1934949:1934996]
B:BD[5.1934949] → [5.1934949:1934996]
```
void turn_corpse_into_chunks( item_def &item )
```
[14.6775]
[5.1934996]
```
void turn_corpse_into_chunks(item_def &item)
```
Replacement in crawl-ref/source/misc.cc at line 161 [5.1933596]
B:BD[5.1934998] → [17.4279:4324]
```
    ASSERT( item.base_type == OBJ_CORPSES );
```
[5.1934998]
[17.4324]
```
    ASSERT(item.base_type == OBJ_CORPSES);
```
Replacement in crawl-ref/source/misc.cc at line 163 [5.1933596]
B:BD[17.4325] → [17.4325:4363]
∅:D[17.4363] → [5.1935037:1935097]
B:BD[5.1935037] → [5.1935037:1935097]
```
    const int mons_class = item.plus;
    const int max_chunks = mons_weight( mons_class ) / 150;
```
[17.4325]
[5.1935097]
```
    const int max_chunks = mons_weight(item.plus) / 150;
```

Replacement in crawl-ref/source/misc.cc at line 167 [5.1933596]

B:BD[14.6807] → [7.36685:36752]

        bleed_onto_floor(you.pos(), mons_class, max_chunks, true);

[14.6807]

[13.10243]

        bleed_onto_floor(you.pos(), item.plus, max_chunks, true);

Replacement in crawl-ref/source/misc.cc at line 171 [5.1933596]

B:BD[18.4166] → [18.4166:4214]

B:BD[5.1935255] → [5.1935255:1935322]

    item.quantity  = 1 + random2( max_chunks );
    item.quantity = stepdown_value( item.quantity, 4, 4, 12, 12 );

[18.4166]

[5.1935322]

    item.quantity  = 1 + random2(max_chunks);
    item.quantity  = stepdown_value(item.quantity, 4, 4, 12, 12);

Replacement in crawl-ref/source/misc.cc at line 178 [5.1933596]

∅:D[19.2885] → [20.370:449]

∅:D[14.6955] → [20.370:449]

B:BD[5.1935428] → [20.370:449]

B:BD[20.449] → [14.6956:6997]

    if (monster_descriptor(mons_class, MDSC_LEAVES_HIDE) && !one_chance_in(3))
        create_monster_hide(mons_class);

[19.2885]

[13.10245]

    if (monster_descriptor(item.plus, MDSC_LEAVES_HIDE) && !one_chance_in(3))
        _create_monster_hide(item.plus);

Replacement in crawl-ref/source/misc.cc at line 359 [5.1933596]
∅:D[21.10055] → [22.5901:5934]
B:BD[22.5901] → [22.5901:5934]
```
    int o = get_item_slot( 20 );
```
[21.10055]
[22.5934]
```
    int o = get_item_slot(20);
```
Replacement in crawl-ref/source/misc.cc at line 388 [5.1933596]
B:BD[22.6682] → [23.57865:57905]
```
    move_item_to_grid( &o, blood.pos );
```
[22.6682]
[22.6729]
```
    move_item_to_grid(&o, blood.pos);
```
Replacement in crawl-ref/source/misc.cc at line 717 [5.1933596]
B:BD[13.14650] → [7.36812:36852]
```
    move_item_to_grid( &o, you.pos() );
```
[13.14650]
[13.14697]
```
    move_item_to_grid(&o, you.pos());
```
Replacement in crawl-ref/source/misc.cc at line 955 [5.1933596]
B:BD[14.8177] → [14.8177:8218]
```
        create_monster_hide(mons_class);
```
[14.8177]
[14.8218]
```
        _create_monster_hide(mons_class);
```
Deletion in crawl-ref/source/misc.cc at line 1003 [5.1933596]
∅:D[24.2841] → [25.6045:6046]
B:BD[22.19190] → [25.6045:6046]
Replacement in crawl-ref/source/misc.cc at line 1041 [5.1933596]
B:BD[21.10212] → [23.57998:58049]
```
    for ( stack_iterator si(you.pos()); si; ++si )
```
[21.10212]
[22.20055]
```
    for (stack_iterator si(you.pos()); si; ++si)
```

Replacement in crawl-ref/source/misc.cc at line 1066 [5.1933596]

B:BD[5.1936957] → [7.36961:37010]

∅:D[7.37010] → [14.10005:10010]

B:BD[14.10005] → [14.10005:10010]

B:BD[14.10010] → [21.10299:10354]

∅:D[21.10354] → [14.10064:10103]

B:BD[14.10064] → [14.10064:10103]

        copy_item_to_grid( potion2, you.pos() );
   }
   // Is decreased even if the decay stack goes splat.
   dec_inv_item_quantity(obj, amount);

[5.1936957]

[14.10103]

        copy_item_to_grid(potion2, you.pos());
    }
    // Is decreased even if the decay stack goes splat.
    dec_inv_item_quantity(obj, amount);

Add more minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1043 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1045 [5.436250]

Insertion in crawl-ref/source/spells4.cc at line 1047 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1054 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1057 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1061 [5.436250]

Replacement in crawl-ref/source/spells2.cc at line 238 [5.569242]

Replacement in crawl-ref/source/misc.h at line 27 [5.1928926]

Replacement in crawl-ref/source/misc.cc at line 83 [5.1933596]

Deletion in crawl-ref/source/misc.cc at line 89 [5.1933596]

Insertion in crawl-ref/source/misc.cc at line 91 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 96 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 132 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 138 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 140 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 143 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 148 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 151 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 154 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 159 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 161 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 163 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 167 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 171 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 178 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 359 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 388 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 717 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 955 [5.1933596]

Deletion in crawl-ref/source/misc.cc at line 1003 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 1041 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 1066 [5.1933596]